Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
Date: Thu, 02 Jun 2016 06:19:04
Message-Id: 1464848330.d076df7ea3d181e92e29b76af78cf84b25f2921b.polynomial-c@gentoo
1 commit: d076df7ea3d181e92e29b76af78cf84b25f2921b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 06:16:40 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 06:18:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d076df7e
7
8 media-gfx/graphicsmagick: Removed old.
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-gfx/graphicsmagick/Manifest | 2 -
14 .../files/graphicsmagick-1.3.16-libpng14.patch | 65 -----------
15 .../files/graphicsmagick-1.3.17-freetype.patch | 32 -----
16 .../files/graphicsmagick-1.3.19-freetype.patch | 15 ---
17 .../graphicsmagick/graphicsmagick-1.3.19.ebuild | 130 ---------------------
18 .../graphicsmagick/graphicsmagick-1.3.20-r1.ebuild | 130 ---------------------
19 6 files changed, 374 deletions(-)
20
21 diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
22 index ab41d97..e78aef7 100644
23 --- a/media-gfx/graphicsmagick/Manifest
24 +++ b/media-gfx/graphicsmagick/Manifest
25 @@ -1,5 +1,3 @@
26 DIST GraphicsMagick-1.3.18.tar.xz 5124436 SHA256 fd48eebe200793e6f62a2b7d96413c94a8967ab56295605513898e2c8524b0ab SHA512 c04dbca467d2ac94d9c47818c7087954ceb54a736fdd062be6d499319037f4bbca3a779542d8acad262b59cb599521f895177574a21975f496ba57061b64b960 WHIRLPOOL d3b396d1cf3691f4aec1387066a55e4105e220cba22ef690234cb8724e955cc5dd4e39c269fddf610d61249850499facaaa54d2150660ed8f5126554a27c11dc
27 -DIST GraphicsMagick-1.3.19.tar.xz 5153772 SHA256 de64372bb7bbff18cf14afd35c8239d9588592f053fd51a82f7239ad42174a54 SHA512 cdfbdc75356ade5037eab836739e7e59156d8b3555112d350f25e47072142e19d47ea9da718d93e40fd864c5bb88810737c078d6fbee9950b964f49519881f6e WHIRLPOOL d4cc6eba8472a5e25cbc9e6b49ec5e1449f1b44e2962936b35227c654d3712d65b4201938127e758be2a6f1818a099de04be4761fd115d3806749965f5c42282
28 -DIST GraphicsMagick-1.3.20.tar.xz 5206616 SHA256 35fa21da4c1479e08da8351c5b1e363adaca803a0064cfc83084363adce387c9 SHA512 59f5eece3a38a98aea43bfc2aefd9c2df458c7f836c8ac05e908c29ea1de295e3f26b63f8daeadac4f40094e5d50aa860472c48e7a52e9f694471d0dcc5bbe37 WHIRLPOOL 13bc6154fbb2224eefdb6f437179a279f8959b4ccff9dc8eb6ef2cec205774a2a7cac4093ac81d36ba22a9879edaca15576ecc56e91da0318b7fffe029a6aecc
29 DIST GraphicsMagick-1.3.23.tar.xz 5355200 SHA256 fd2535a529528ec6f0bd493fed4395e08082faf940d51d7c18c25586a0a0e60d SHA512 40f0a2d96ea568cc6e52ae0003c2ad393b2cffc6eabb85db78cb22af00eafec3fa1e64ebb26eed4a271f7a54c35c3b985e99a3d0b404fd025f4dba156856c99a WHIRLPOOL a1745035437981205543652e472f1f8a24402555657f79357d87402635f4e10026051ca7850ff6d655ab6321360702f2be80bf5443ca3e83cc471a84382f0107
30 DIST GraphicsMagick-1.3.24.tar.xz 5372048 SHA256 52bfbacef4be3fbae756dbfd342e4843d2a446bef96450bfbe2c23ca60e180e0 SHA512 d55f8b7d96bc746e2b501ec6315f174f2ab5f6b31a1d138196bf17b506e6d0c2b91ee19f5dd0a2877cd47910aebdcf11158303e90b1b267c6082d462f8548684 WHIRLPOOL 5d666812748389b723dd939cf4f9f4dd5d0ec6a99510db7b0db49ab12e38fa844c8e4da60053566974f0f9174226dd21bd697a718d6f97d163346617701176fb
31
32 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
33 deleted file mode 100644
34 index bacf70e..0000000
35 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
36 +++ /dev/null
37 @@ -1,65 +0,0 @@
38 -
39 -# HG changeset patch
40 -# User Glenn Randers-Pehrson <glennrp@simple...>
41 -# Date 1343491548 18000
42 -# Node ID d6e469d02cd260b6531e86a8a6c8a5a2b9ff51cb
43 -# Parent fe9e2eb655ce8b85abfd9b88d20a8a1648ad71e7
44 -coders/png.c: Some typecasts were inconsistent with libpng-1.4 and later.
45 -
46 -diff -r fe9e2eb655ce -r d6e469d02cd2 coders/png.c
47 ---- a/coders/png.c Thu Jul 26 20:24:26 2012 -0500
48 -+++ b/coders/png.c Sat Jul 28 11:05:48 2012 -0500
49 -@@ -1360,7 +1360,11 @@
50 - }
51 -
52 - #ifdef PNG_USER_MEM_SUPPORTED
53 --static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
54 -+#if PNG_LIBPNG_VER >= 14000
55 -+static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
56 -+#else
57 -+static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
58 -+#endif
59 - {
60 - (void) png_ptr;
61 - return MagickAllocateMemory(png_voidp,(size_t) size);
62 -@@ -6169,12 +6173,22 @@
63 - (void) printf("writing raw profile: type=%.1024s, length=%lu\n",
64 - profile_type, (unsigned long)length);
65 - }
66 -- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
67 -+#if PNG_LIBPNG_VER >= 14000
68 -+ text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
69 -+#else
70 -+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
71 -+#endif
72 - description_length=strlen((const char *) profile_description);
73 - allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
74 - + description_length);
75 -- text[0].text=(png_charp) png_malloc(ping,allocated_length);
76 -- text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
77 -+#if PNG_LIBPNG_VER >= 14000
78 -+ text[0].text=(png_charp) png_malloc(ping,
79 -+ (png_alloc_size_t) allocated_length);
80 -+ text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
81 -+#else
82 -+ text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
83 -+ text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
84 -+#endif
85 - text[0].key[0]='\0';
86 - (void) strcat(text[0].key, "Raw profile type ");
87 - (void) strncat(text[0].key, (const char *) profile_type, 61);
88 -@@ -7620,7 +7634,12 @@
89 -
90 - if (*attribute->key == '[')
91 - continue;
92 -- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
93 -+#if PNG_LIBPNG_VER >= 14000
94 -+ text=(png_textp) png_malloc(ping,
95 -+ (png_alloc_size_t) sizeof(png_text));
96 -+#else
97 -+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
98 -+#endif
99 - text[0].key=attribute->key;
100 - text[0].text=attribute->value;
101 - text[0].text_length=strlen(attribute->value);
102 -
103
104 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch
105 deleted file mode 100644
106 index 3ae4ad4..0000000
107 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch
108 +++ /dev/null
109 @@ -1,32 +0,0 @@
110 -https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
111 -
112 ---- a/configure
113 -+++ b/configure
114 -@@ -26488,7 +26488,6 @@
115 - # directory as GraphicsMagick installation prefix.
116 - #LDFLAGS="$LDFLAGS -L$LIB_DIR"
117 - #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
118 --MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_CPPFLAGS"
119 -
120 - #
121 - # Find the X11 RGB database
122 -@@ -29490,8 +29490,8 @@
123 - then
124 - freetype_prefix=`${freetype_config} --prefix`
125 - freetype_exec_prefix=`${freetype_config} --exec-prefix`
126 -- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
127 -- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
128 -+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
129 -+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
130 - fi
131 -
132 - dnl First see if there is a library
133 -@@ -35767,7 +35767,7 @@
134 -
135 - MAGICK_API_CFLAGS=$CFLAGS
136 - MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
137 --MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
138 -+MAGICK_API_LDFLAGS="$LDFLAGS"
139 - MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
140 - MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
141 -
142
143 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch
144 deleted file mode 100644
145 index 4ef1fb9..0000000
146 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch
147 +++ /dev/null
148 @@ -1,15 +0,0 @@
149 -https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
150 -
151 ---- GraphicsMagick-1.3.19/configure.ac
152 -+++ GraphicsMagick-1.3.19/configure.ac
153 -@@ -2283,8 +2284,8 @@
154 - then
155 - freetype_prefix=`${freetype_config} --prefix`
156 - freetype_exec_prefix=`${freetype_config} --exec-prefix`
157 -- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
158 -- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
159 -+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
160 -+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
161 - fi
162 -
163 - dnl First see if there is a library
164
165 diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild
166 deleted file mode 100644
167 index 3f5d217..0000000
168 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild
169 +++ /dev/null
170 @@ -1,130 +0,0 @@
171 -# Copyright 1999-2014 Gentoo Foundation
172 -# Distributed under the terms of the GNU General Public License v2
173 -# $Id$
174 -
175 -EAPI=5
176 -inherit autotools eutils toolchain-funcs
177 -
178 -MY_P=${P/graphicsm/GraphicsM}
179 -
180 -DESCRIPTION="Collection of tools and libraries for many image formats"
181 -HOMEPAGE="http://www.graphicsmagick.org/"
182 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
183 -
184 -LICENSE="MIT"
185 -SLOT="0"
186 -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
187 -IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
188 - perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib"
189 -
190 -RDEPEND=">=sys-devel/libtool-2.2.6b
191 - bzip2? ( app-arch/bzip2 )
192 - fpx? ( media-libs/libfpx )
193 - imagemagick? ( !media-gfx/imagemagick )
194 - jbig? ( media-libs/jbigkit )
195 - jpeg? ( virtual/jpeg )
196 - jpeg2k? ( media-libs/jasper )
197 - lcms? ( media-libs/lcms:2 )
198 - lzma? ( app-arch/xz-utils )
199 - perl? ( dev-lang/perl )
200 - png? ( media-libs/libpng:0 )
201 - postscript? ( app-text/ghostscript-gpl )
202 - svg? ( dev-libs/libxml2 )
203 - tiff? ( media-libs/tiff:0 )
204 - truetype? (
205 - media-fonts/urw-fonts
206 - >=media-libs/freetype-2
207 - )
208 - webp? ( media-libs/libwebp )
209 - wmf? ( media-libs/libwmf )
210 - X? (
211 - x11-libs/libSM
212 - x11-libs/libXext
213 - )
214 - zlib? ( sys-libs/zlib )"
215 -DEPEND="${RDEPEND}"
216 -
217 -S=${WORKDIR}/${MY_P}
218 -
219 -src_prepare() {
220 - epatch "${FILESDIR}"/${PN}-1.3.19-freetype.patch
221 - epatch "${FILESDIR}"/${PN}-1.3.19-flags.patch
222 - epatch "${FILESDIR}"/${PN}-1.3.19-perl.patch
223 - epatch "${FILESDIR}"/${PN}-1.3.18-powerpc.patch
224 -
225 - epatch_user #498942
226 -
227 - eautoreconf
228 -}
229 -
230 -src_configure() {
231 - local depth=8
232 - use q16 && depth=16
233 - use q32 && depth=32
234 -
235 - local openmp=disable
236 - if use openmp && tc-has-openmp; then
237 - openmp=enable
238 - fi
239 -
240 - econf \
241 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
242 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
243 - --${openmp}-openmp \
244 - --enable-largefile \
245 - --enable-shared \
246 - $(use_enable static-libs static) \
247 - $(use_enable debug prof) \
248 - $(use_enable debug gcov) \
249 - $(use_enable imagemagick magick-compat) \
250 - $(use_with threads) \
251 - $(use_with modules) \
252 - --with-quantum-depth=${depth} \
253 - --without-frozenpaths \
254 - $(use_with cxx magick-plus-plus) \
255 - $(use_with perl) \
256 - --with-perl-options=INSTALLDIRS=vendor \
257 - $(use_with bzip2 bzlib) \
258 - $(use_with postscript dps) \
259 - $(use_with fpx) \
260 - --without-gslib \
261 - $(use_with jbig) \
262 - $(use_with webp) \
263 - $(use_with jpeg) \
264 - $(use_with jpeg2k jp2) \
265 - --without-lcms \
266 - $(use_with lcms lcms2) \
267 - $(use_with lzma) \
268 - $(use_with png) \
269 - $(use_with tiff) \
270 - $(use_with truetype ttf) \
271 - $(use_with wmf) \
272 - --with-fontpath="${EPREFIX}"/usr/share/fonts \
273 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
274 - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
275 - $(use_with svg xml) \
276 - $(use_with zlib) \
277 - $(use_with X x)
278 -}
279 -
280 -src_compile() {
281 - default
282 - use perl && emake perl-build
283 -}
284 -
285 -src_test() {
286 - unset DISPLAY # some perl tests fail when DISPLAY is set
287 - default
288 -}
289 -
290 -src_install() {
291 - default
292 -
293 - if use perl; then
294 - emake -C PerlMagick DESTDIR="${D}" install
295 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
296 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
297 - fi
298 -
299 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
300 -}
301
302 diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild
303 deleted file mode 100644
304 index 6cc10fe..0000000
305 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild
306 +++ /dev/null
307 @@ -1,130 +0,0 @@
308 -# Copyright 1999-2014 Gentoo Foundation
309 -# Distributed under the terms of the GNU General Public License v2
310 -# $Id$
311 -
312 -EAPI=5
313 -inherit autotools eutils toolchain-funcs
314 -
315 -MY_P=${P/graphicsm/GraphicsM}
316 -
317 -DESCRIPTION="Collection of tools and libraries for many image formats"
318 -HOMEPAGE="http://www.graphicsmagick.org/"
319 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
320 -
321 -LICENSE="MIT"
322 -SLOT="0"
323 -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
324 -IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
325 - perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib"
326 -
327 -RDEPEND=">=sys-devel/libtool-2.2.6b
328 - bzip2? ( app-arch/bzip2 )
329 - fpx? ( media-libs/libfpx )
330 - imagemagick? ( !media-gfx/imagemagick )
331 - jbig? ( media-libs/jbigkit )
332 - jpeg? ( virtual/jpeg:0 )
333 - jpeg2k? ( media-libs/jasper )
334 - lcms? ( media-libs/lcms:2 )
335 - lzma? ( app-arch/xz-utils )
336 - perl? ( dev-lang/perl )
337 - png? ( media-libs/libpng:0 )
338 - postscript? ( app-text/ghostscript-gpl )
339 - svg? ( dev-libs/libxml2 )
340 - tiff? ( media-libs/tiff:0 )
341 - truetype? (
342 - media-fonts/urw-fonts
343 - >=media-libs/freetype-2
344 - )
345 - webp? ( media-libs/libwebp )
346 - wmf? ( media-libs/libwmf )
347 - X? (
348 - x11-libs/libSM
349 - x11-libs/libXext
350 - )
351 - zlib? ( sys-libs/zlib )"
352 -DEPEND="${RDEPEND}"
353 -
354 -S=${WORKDIR}/${MY_P}
355 -
356 -src_prepare() {
357 - epatch "${FILESDIR}"/${PN}-1.3.19-freetype.patch
358 - epatch "${FILESDIR}"/${PN}-1.3.19-flags.patch
359 - epatch "${FILESDIR}"/${PN}-1.3.19-perl.patch
360 - epatch "${FILESDIR}"/${P}-powerpc.patch
361 -
362 - epatch_user #498942
363 -
364 - eautoreconf
365 -}
366 -
367 -src_configure() {
368 - local depth=8
369 - use q16 && depth=16
370 - use q32 && depth=32
371 -
372 - local openmp=disable
373 - if use openmp && tc-has-openmp; then
374 - openmp=enable
375 - fi
376 -
377 - econf \
378 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
379 - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
380 - --${openmp}-openmp \
381 - --enable-largefile \
382 - --enable-shared \
383 - $(use_enable static-libs static) \
384 - $(use_enable debug prof) \
385 - $(use_enable debug gcov) \
386 - $(use_enable imagemagick magick-compat) \
387 - $(use_with threads) \
388 - $(use_with modules) \
389 - --with-quantum-depth=${depth} \
390 - --without-frozenpaths \
391 - $(use_with cxx magick-plus-plus) \
392 - $(use_with perl) \
393 - --with-perl-options=INSTALLDIRS=vendor \
394 - $(use_with bzip2 bzlib) \
395 - $(use_with postscript dps) \
396 - $(use_with fpx) \
397 - --without-gslib \
398 - $(use_with jbig) \
399 - $(use_with webp) \
400 - $(use_with jpeg) \
401 - $(use_with jpeg2k jp2) \
402 - --without-lcms \
403 - $(use_with lcms lcms2) \
404 - $(use_with lzma) \
405 - $(use_with png) \
406 - $(use_with tiff) \
407 - $(use_with truetype ttf) \
408 - $(use_with wmf) \
409 - --with-fontpath="${EPREFIX}"/usr/share/fonts \
410 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
411 - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
412 - $(use_with svg xml) \
413 - $(use_with zlib) \
414 - $(use_with X x)
415 -}
416 -
417 -src_compile() {
418 - default
419 - use perl && emake perl-build
420 -}
421 -
422 -src_test() {
423 - unset DISPLAY # some perl tests fail when DISPLAY is set
424 - default
425 -}
426 -
427 -src_install() {
428 - default
429 -
430 - if use perl; then
431 - emake -C PerlMagick DESTDIR="${D}" install
432 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
433 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
434 - fi
435 -
436 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
437 -}