Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/
Date: Mon, 23 Dec 2019 23:20:36
Message-Id: 1577143217.ad89ce5110985e70d7eeed72a94f5de907bfb76f.soap@gentoo
1 commit: ad89ce5110985e70d7eeed72a94f5de907bfb76f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 23:20:17 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 23:20:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad89ce51
7
8 media-libs/giflib: Remove old
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 media-libs/giflib/Manifest | 4 --
14 media-libs/giflib/files/giflib-4.1.6-gif2rle.patch | 18 -----
15 .../giflib-4.1.6-giffix-null-Extension-fix.patch | 15 -----
16 media-libs/giflib/files/giflib-5.1.8-gentoo.patch | 16 -----
17 media-libs/giflib/giflib-4.1.6-r3.ebuild | 54 ---------------
18 media-libs/giflib/giflib-5.0.6.ebuild | 42 ------------
19 media-libs/giflib/giflib-5.1.8-r1.ebuild | 77 ----------------------
20 media-libs/giflib/giflib-5.1.9.ebuild | 77 ----------------------
21 media-libs/giflib/metadata.xml | 3 -
22 9 files changed, 306 deletions(-)
23
24 diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
25 index d53ffb9540f..a6794c6fbe7 100644
26 --- a/media-libs/giflib/Manifest
27 +++ b/media-libs/giflib/Manifest
28 @@ -1,6 +1,2 @@
29 -DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
30 -DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
31 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
32 -DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
33 -DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650 SHA512 b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
34 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
35
36 diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
37 deleted file mode 100644
38 index 95334016648..00000000000
39 --- a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
40 +++ /dev/null
41 @@ -1,18 +0,0 @@
42 -https://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
43 -
44 ---- giflib/util/gif2rle.c
45 -+++ giflib/util/gif2rle.c
46 -@@ -222,11 +222,8 @@
47 - ColorMap = (GifFile->Image.ColorMap ?
48 - GifFile->Image.ColorMap->Colors :
49 - GifFile->SColorMap->Colors);
50 -- if (ColorMap == NULL) {
51 -- fprintf(stderr, "Gif Image does not have a colormap\n");
52 -- exit(EXIT_FAILURE);
53 -- }
54 -- ColorMapSize = 1 << ColorMap->BitsPerPixel;
55 -+ ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
56 -+ GifFile->SColorMap->BitsPerPixel);
57 - DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
58 -
59 - if (DGifCloseFile(GifFile) == GIF_ERROR) {
60
61 diff --git a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
62 deleted file mode 100644
63 index 3e99e66c0d1..00000000000
64 --- a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
65 +++ /dev/null
66 @@ -1,15 +0,0 @@
67 -diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
68 ---- giflib-4.1.6/util/giffix.c 2005-10-09 23:22:23.000000000 -0700
69 -+++ giflib-4.1.6.new/util/giffix.c 2008-09-04 14:00:41.000000000 -0700
70 -@@ -181,8 +181,8 @@
71 - /* Skip any extension blocks in file: */
72 - if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR)
73 - QuitGifError(GifFileIn, GifFileOut);
74 -- if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
75 -- Extension) == GIF_ERROR)
76 -+ if (Extension && EGifPutExtension(GifFileOut, ExtCode,
77 -+ Extension[0], Extension) == GIF_ERROR)
78 - QuitGifError(GifFileIn, GifFileOut);
79 -
80 - /* No support to more than one extension blocks, so discard: */
81 -
82
83 diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
84 deleted file mode 100644
85 index 90a72685d34..00000000000
86 --- a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
87 +++ /dev/null
88 @@ -1,16 +0,0 @@
89 ---- giflib-5.1.8/Makefile
90 -+++ giflib-5.1.8/Makefile
91 -@@ -61,12 +61,11 @@
92 - LDLIBS=libgif.a -lm
93 -
94 - all: libgif.so libgif.a $(UTILS)
95 -- $(MAKE) -C doc
96 -
97 - $(UTILS):: libgif.a
98 -
99 - libgif.so: $(OBJECTS) $(HEADERS)
100 -- $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
101 -+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
102 -
103 - libgif.a: $(OBJECTS) $(HEADERS)
104 - $(AR) rcs libgif.a $(OBJECTS)
105
106 diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
107 deleted file mode 100644
108 index 4fc4d01d092..00000000000
109 --- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
110 +++ /dev/null
111 @@ -1,54 +0,0 @@
112 -# Copyright 1999-2017 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=5
116 -
117 -inherit epatch epunt-cxx libtool ltprune multilib-minimal
118 -
119 -DESCRIPTION="Library to handle, display and manipulate GIF images"
120 -HOMEPAGE="https://sourceforge.net/projects/giflib/"
121 -SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
122 -
123 -LICENSE="MIT"
124 -SLOT="0"
125 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
126 -IUSE="rle static-libs X"
127 -
128 -RDEPEND="
129 - rle? ( media-libs/urt )
130 - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
131 -DEPEND="${RDEPEND}"
132 -
133 -src_prepare() {
134 - epatch "${FILESDIR}"/${P}-gif2rle.patch
135 - epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
136 - sed -i '/X_PRE_LIBS/s:-lSM -lICE::' configure || die #483258
137 - elibtoolize
138 - epunt_cxx
139 -}
140 -
141 -multilib_src_configure() {
142 - local myconf=()
143 -
144 - # prevent circular depend #111455
145 - if multilib_is_native_abi && has_version media-libs/urt ; then
146 - myconf+=( $(use_enable rle) )
147 - else
148 - myconf+=( --disable-rle )
149 - fi
150 -
151 - ECONF_SOURCE=${S} \
152 - econf \
153 - --disable-gl \
154 - $(use_enable static-libs static) \
155 - $(use_enable X x11) \
156 - "${myconf[@]}"
157 -}
158 -
159 -multilib_src_install_all() {
160 - # for static libs the .la file is required if build with +rle or +X
161 - use static-libs || prune_libtool_files --all
162 -
163 - dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
164 - dohtml -r doc
165 -}
166
167 diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
168 deleted file mode 100644
169 index f80e51e8c66..00000000000
170 --- a/media-libs/giflib/giflib-5.0.6.ebuild
171 +++ /dev/null
172 @@ -1,42 +0,0 @@
173 -# Copyright 1999-2014 Gentoo Foundation
174 -# Distributed under the terms of the GNU General Public License v2
175 -
176 -EAPI=5
177 -
178 -inherit eutils libtool autotools-multilib
179 -
180 -DESCRIPTION="Library to handle, display and manipulate GIF images"
181 -HOMEPAGE="https://sourceforge.net/projects/giflib/"
182 -SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
183 -
184 -LICENSE="MIT"
185 -SLOT="0/6"
186 -# Needs testing first.
187 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
188 -IUSE="static-libs"
189 -
190 -src_prepare() {
191 - elibtoolize
192 -}
193 -
194 -src_configure() {
195 - local myeconfargs=(
196 - # No need for xmlto as they ship generated files.
197 - ac_cv_prog_have_xmlto=no
198 -
199 - $(use_enable static-libs static)
200 - )
201 -
202 - autotools-multilib_src_configure
203 -}
204 -
205 -src_install() {
206 - autotools-multilib_src_install
207 -
208 - # for static libs the .la file is required if built with +X
209 - use static-libs || prune_libtool_files --all
210 -
211 - doman doc/*.1
212 - dodoc doc/*.txt
213 - dohtml -r doc
214 -}
215
216 diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild
217 deleted file mode 100644
218 index fcf9ffd016a..00000000000
219 --- a/media-libs/giflib/giflib-5.1.8-r1.ebuild
220 +++ /dev/null
221 @@ -1,77 +0,0 @@
222 -# Copyright 1999-2019 Gentoo Authors
223 -# Distributed under the terms of the GNU General Public License v2
224 -
225 -EAPI=7
226 -
227 -inherit multilib-minimal toolchain-funcs
228 -
229 -DESCRIPTION="Library to handle, display and manipulate GIF images"
230 -HOMEPAGE="https://sourceforge.net/projects/giflib/"
231 -SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
232 -
233 -LICENSE="MIT"
234 -SLOT="0/7"
235 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
236 -IUSE="doc static-libs"
237 -
238 -DEPEND="doc? ( app-text/xmlto )"
239 -
240 -PATCHES=(
241 - "${FILESDIR}"/${PN}-5.1.8-gentoo.patch
242 -)
243 -
244 -src_prepare() {
245 - default
246 - multilib_copy_sources
247 -}
248 -
249 -multilib_src_compile() {
250 - # Use reallocarray() from libc if available.
251 - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
252 - local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
253 - sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
254 - rm openbsd-reallocarray.c || die
255 - fi
256 -
257 - emake \
258 - CC="$(tc-getCC)" \
259 - CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
260 - LDFLAGS="${LDFLAGS}" \
261 - OFLAGS="" \
262 - all
263 -
264 - if use doc && multilib_is_native_abi; then
265 - emake -C doc
266 - fi
267 -}
268 -
269 -multilib_src_install() {
270 - emake \
271 - DESTDIR="${D}" \
272 - PREFIX="${EPREFIX}/usr" \
273 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
274 - install
275 -
276 - if ! use static-libs ; then
277 - find "${ED}" -name "*.a" -delete || die
278 - fi
279 -
280 - if use doc && multilib_is_native_abi; then
281 - docinto html
282 - dodoc doc/*.html
283 - fi
284 -}
285 -
286 -multilib_src_install_all() {
287 - docinto
288 - dodoc ChangeLog NEWS README TODO
289 - if use doc ; then
290 - dodoc doc/*.txt
291 - docinto html
292 - dodoc -r doc/whatsinagif
293 - fi
294 -}
295 -
296 -multilib_src_test() {
297 - emake -j1 check
298 -}
299
300 diff --git a/media-libs/giflib/giflib-5.1.9.ebuild b/media-libs/giflib/giflib-5.1.9.ebuild
301 deleted file mode 100644
302 index 55389387dae..00000000000
303 --- a/media-libs/giflib/giflib-5.1.9.ebuild
304 +++ /dev/null
305 @@ -1,77 +0,0 @@
306 -# Copyright 1999-2019 Gentoo Authors
307 -# Distributed under the terms of the GNU General Public License v2
308 -
309 -EAPI=7
310 -
311 -inherit multilib-minimal toolchain-funcs
312 -
313 -DESCRIPTION="Library to handle, display and manipulate GIF images"
314 -HOMEPAGE="https://sourceforge.net/projects/giflib/"
315 -SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
316 -
317 -LICENSE="MIT"
318 -SLOT="0/7"
319 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
320 -IUSE="doc static-libs"
321 -
322 -DEPEND="doc? ( app-text/xmlto )"
323 -
324 -PATCHES=(
325 - "${FILESDIR}"/${PN}-5.1.9-gentoo.patch
326 -)
327 -
328 -src_prepare() {
329 - default
330 - multilib_copy_sources
331 -}
332 -
333 -multilib_src_compile() {
334 - # Use reallocarray() from libc if available.
335 - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
336 - local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
337 - sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
338 - rm openbsd-reallocarray.c || die
339 - fi
340 -
341 - emake \
342 - CC="$(tc-getCC)" \
343 - CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
344 - LDFLAGS="${LDFLAGS}" \
345 - OFLAGS="" \
346 - all
347 -
348 - if use doc && multilib_is_native_abi; then
349 - emake -C doc
350 - fi
351 -}
352 -
353 -multilib_src_install() {
354 - emake \
355 - DESTDIR="${D}" \
356 - PREFIX="${EPREFIX}/usr" \
357 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
358 - install
359 -
360 - if ! use static-libs ; then
361 - find "${ED}" -name "*.a" -delete || die
362 - fi
363 -
364 - if use doc && multilib_is_native_abi; then
365 - docinto html
366 - dodoc doc/*.html
367 - fi
368 -}
369 -
370 -multilib_src_install_all() {
371 - docinto
372 - dodoc ChangeLog NEWS README TODO
373 - if use doc ; then
374 - dodoc doc/*.txt
375 - docinto html
376 - dodoc -r doc/whatsinagif
377 - fi
378 -}
379 -
380 -multilib_src_test() {
381 - emake -j1 check
382 -}
383
384 diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
385 index e88f57a6700..8aeeef3de70 100644
386 --- a/media-libs/giflib/metadata.xml
387 +++ b/media-libs/giflib/metadata.xml
388 @@ -5,9 +5,6 @@
389 <email>graphics@g.o</email>
390 <name>Gentoo Graphics Project</name>
391 </maintainer>
392 - <use>
393 - <flag name="rle">Build converters for RLE format (utah raster toolkit)</flag>
394 - </use>
395 <upstream>
396 <remote-id type="sourceforge">giflib</remote-id>
397 </upstream>