Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/, media-libs/netpbm/files/
Date: Thu, 01 Sep 2022 02:16:34
Message-Id: 1661998570.c41ea8f438e6d0547e9e53c612b9f0752ddde6c9.sam@gentoo
1 commit: c41ea8f438e6d0547e9e53c612b9f0752ddde6c9
2 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 24 07:53:02 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 02:16:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41ea8f4
7
8 media-libs/netpbm: drop 10.86.24-r1, 10.86.27, 10.86.30
9
10 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/26996
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 media-libs/netpbm/Manifest | 3 -
15 .../files/netpbm-10.86.24-fix-test-ppc64.patch | 22 --
16 media-libs/netpbm/netpbm-10.86.24-r1.ebuild | 220 --------------------
17 media-libs/netpbm/netpbm-10.86.27.ebuild | 227 --------------------
18 media-libs/netpbm/netpbm-10.86.30.ebuild | 229 ---------------------
19 5 files changed, 701 deletions(-)
20
21 diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
22 index 157e6e1daadd..297c499d1ba7 100644
23 --- a/media-libs/netpbm/Manifest
24 +++ b/media-libs/netpbm/Manifest
25 @@ -1,5 +1,2 @@
26 -DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
27 -DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
28 -DIST netpbm-10.86.30.tar.xz 3692036 BLAKE2B 2529adfe7f93cf2400547c107cf04b03478aef95bce6573195a6a9e20767b04371bcff13744aa547885ffa3137d948076de01ad0a979f4464c13e3fdeeb37bf7 SHA512 7643b279c59717b30130e7178be82638085d2ae28c0cea8c7595f5ff3a1cd3c5dd0201a051bed8997f8a8354b5eeb08949d4e8587d3e807df7859a4cb1a44534
29 DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca
30 DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870
31
32 diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
33 deleted file mode 100644
34 index e1b558d59117..000000000000
35 --- a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
36 +++ /dev/null
37 @@ -1,22 +0,0 @@
38 -char is unsigned by default on ppc64
39 -
40 ---- a/converter/other/pnmtopalm/palmtopnm.c
41 -+++ b/converter/other/pnmtopalm/palmtopnm.c
42 -@@ -823,7 +823,7 @@
43 - unsigned int j;
44 -
45 - for (j = 0; j < bytesPerRow; ) {
46 -- char incount;
47 -+ signed char incount;
48 - pm_readchar(ifP, &incount);
49 - if (incount < 0) {
50 - /* How do we handle incount == -128 ? */
51 -@@ -865,7 +865,7 @@
52 - unsigned int j;
53 -
54 - for (j = 0; j < bytesPerRow; ) {
55 -- char incount;
56 -+ signed char incount;
57 - pm_readchar(ifP, &incount);
58 - if (incount < 0) {
59 - /* How do we handle incount == -128 ? */
60
61 diff --git a/media-libs/netpbm/netpbm-10.86.24-r1.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
62 deleted file mode 100644
63 index bef703001a86..000000000000
64 --- a/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
65 +++ /dev/null
66 @@ -1,220 +0,0 @@
67 -# Copyright 1999-2021 Gentoo Authors
68 -# Distributed under the terms of the GNU General Public License v2
69 -
70 -EAPI=8
71 -
72 -inherit multilib toolchain-funcs
73 -
74 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
75 -HOMEPAGE="http://netpbm.sourceforge.net/"
76 -SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
77 -
78 -LICENSE="GPL-2"
79 -SLOT="0"
80 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
81 -IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
82 -# zlib USE flag is no longer used, enabled by default.
83 -# cannot remove it yet because of #801445
84 -
85 -BDEPEND="
86 - app-arch/xz-utils
87 - sys-devel/flex
88 - virtual/pkgconfig
89 -"
90 -# app-text/ghostscript-gpl is really needed for postscript
91 -# some utilities execute /usr/bin/gs
92 -RDEPEND="jbig? ( media-libs/jbigkit:= )
93 - jpeg? ( virtual/jpeg:0 )
94 - png? (
95 - >=media-libs/libpng-1.4:0=
96 - sys-libs/zlib
97 - )
98 - postscript? (
99 - app-text/ghostscript-gpl
100 - sys-libs/zlib
101 - )
102 - rle? ( media-libs/urt:= )
103 - svga? ( media-libs/svgalib )
104 - tiff? ( >=media-libs/tiff-3.5.5:0 )
105 - xml? ( dev-libs/libxml2 )
106 - X? ( x11-libs/libX11 )"
107 -DEPEND="${RDEPEND}"
108 -
109 -PATCHES=(
110 - "${FILESDIR}"/netpbm-10.86.21-build.patch
111 - "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
112 - "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
113 - "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
114 - "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
115 -)
116 -
117 -netpbm_libtype() {
118 - case ${CHOST} in
119 - *-darwin*) echo dylib;;
120 - *) echo unixshared;;
121 - esac
122 -}
123 -
124 -netpbm_libsuffix() {
125 - local suffix=$(get_libname)
126 - echo ${suffix//\.}
127 -}
128 -
129 -netpbm_ldshlib() {
130 - case ${CHOST} in
131 - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
132 - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
133 - esac
134 -}
135 -netpbm_config() {
136 - if use ${1} ; then
137 - [[ ${2} != "!" ]] && echo -l${2:-$1}
138 - else
139 - echo NONE
140 - fi
141 -}
142 -
143 -src_prepare() {
144 - default
145 -
146 - # make sure we use system libs
147 - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
148 - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
149 -
150 - # take care of the importinc stuff ourselves by only doing it once
151 - # at the top level and having all subdirs use that one set #149843
152 - sed -i \
153 - -e '/^importinc:/s|^|importinc:\nmanual_|' \
154 - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
155 - common.mk || die
156 - sed -i \
157 - -e '/%.c/s: importinc$::' \
158 - common.mk lib/Makefile lib/util/Makefile || die
159 - sed -i \
160 - -e 's:pkg-config:$(PKG_CONFIG):' \
161 - GNUmakefile converter/other/Makefile other/pamx/Makefile || die
162 -
163 - # The postscript knob is currently bound up with a fork test.
164 - if ! use postscript ; then
165 - sed -i \
166 - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
167 - converter/other/Makefile generator/Makefile || die
168 - sed -i -r \
169 - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
170 - test/all-in-place.{ok,test} || die
171 - sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
172 - sed -i -e '/^$/d' test/all-in-place.ok || die
173 - sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
174 - fi
175 -
176 - # the new postscript test needs +x
177 - chmod +x test/lps-roundtrip.test
178 -
179 - # Do not test png if not built
180 - if ! use png ; then
181 - sed -i -r \
182 - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
183 - test/all-in-place.{ok,test} || die
184 - sed -i -e '/^$/d' test/all-in-place.ok || die
185 -
186 - sed -i -r \
187 - -e 's:(pamrgbatopng|pngtopnm).*::' \
188 - test/legacy-names.{ok,test} || die
189 - sed -i -e '/^$/d' test/legacy-names.ok || die
190 - sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
191 - fi
192 -}
193 -
194 -src_configure() {
195 - # cannot chain the die with the heredoc
196 - # repoman tries to parse the heredoc and fails
197 - cat config.mk.in - >> config.mk <<-EOF
198 - # Misc crap
199 - BUILD_FIASCO = N
200 - SYMLINK = ln -sf
201 -
202 - # These vars let src_test work by default
203 - PKGDIR_DEFAULT = ${T}/netpbm
204 - RESULTDIR_DEFAULT = ${T}/netpbm-test
205 -
206 - # Toolchain options
207 - CC = $(tc-getCC) -Wall
208 - LD = \$(CC)
209 - CC_FOR_BUILD = $(tc-getBUILD_CC)
210 - LD_FOR_BUILD = \$(CC_FOR_BUILD)
211 - AR = $(tc-getAR)
212 - RANLIB = $(tc-getRANLIB)
213 - PKG_CONFIG = $(tc-getPKG_CONFIG)
214 -
215 - STRIPFLAG =
216 - CFLAGS_SHLIB = -fPIC
217 -
218 - LDRELOC = \$(LD) -r
219 - LDSHLIB = $(netpbm_ldshlib)
220 - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
221 - LINKERISCOMPILER = Y
222 - NETPBMLIBSUFFIX = $(netpbm_libsuffix)
223 - NETPBMLIBTYPE = $(netpbm_libtype)
224 - STATICLIB_TOO = $(usex static-libs Y N)
225 -
226 - # The var is called SSE, but the code is actually SSE2.
227 - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
228 -
229 - # Gentoo build options
230 - TIFFLIB = $(netpbm_config tiff)
231 - # Let tiff worry about its own dependencies #395753
232 - TIFFLIB_NEEDS_JPEG = N
233 - TIFFLIB_NEEDS_Z = N
234 - JPEGLIB = $(netpbm_config jpeg)
235 - PNGLIB = $(netpbm_config png)
236 - ZLIB = -lz
237 - LINUXSVGALIB = $(netpbm_config svga vga)
238 - XML2_LIBS = $(netpbm_config xml xml2)
239 - JBIGLIB = $(netpbm_config jbig)
240 - JBIGHDR_DIR =
241 - JASPERLIB = NONE
242 - JASPERHDR_DIR =
243 - URTLIB = $(netpbm_config rle)
244 - URTHDR_DIR =
245 - X11LIB = $(netpbm_config X X11)
246 - X11HDR_DIR =
247 - EOF
248 - [[ $? -eq 0 ]] || die "writing config.mk failed"
249 -}
250 -
251 -src_compile() {
252 - emake -j1 pm_config.h version.h manual_importinc #149843
253 - emake
254 -}
255 -
256 -src_test() {
257 - # The code wants to install everything first and then test the result.
258 - emake install.{bin,lib,data}
259 - emake check
260 -}
261 -
262 -src_install() {
263 - # Subdir make targets like to use `mkdir` all over the place
264 - # without any actual dependencies, thus the -j1.
265 - emake -j1 package pkgdir="${ED}"/usr
266 -
267 - if [[ $(get_libdir) != "lib" ]] ; then
268 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
269 - fi
270 -
271 - # Remove cruft that we don't need, and move around stuff we want
272 - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
273 -
274 - dodir /usr/share
275 - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
276 -
277 - doman userguide/*.[0-9]
278 - dodoc README
279 -
280 - cd doc || die
281 - dodoc HISTORY Netpbm.programming USERDOC
282 - docinto html
283 - dodoc -r *.html
284 -
285 - use doc && dodoc -r ../userguide/*.html
286 -}
287
288 diff --git a/media-libs/netpbm/netpbm-10.86.27.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
289 deleted file mode 100644
290 index f263c1e4370c..000000000000
291 --- a/media-libs/netpbm/netpbm-10.86.27.ebuild
292 +++ /dev/null
293 @@ -1,227 +0,0 @@
294 -# Copyright 1999-2022 Gentoo Authors
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=8
298 -
299 -inherit flag-o-matic multilib toolchain-funcs
300 -
301 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
302 -HOMEPAGE="http://netpbm.sourceforge.net/"
303 -SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
304 -
305 -LICENSE="GPL-2"
306 -SLOT="0"
307 -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
308 -IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
309 -# zlib USE flag is no longer used, enabled by default.
310 -# cannot remove it yet because of #801445
311 -
312 -BDEPEND="
313 - app-arch/xz-utils
314 - sys-devel/flex
315 - virtual/pkgconfig
316 -"
317 -# app-text/ghostscript-gpl is really needed for postscript
318 -# some utilities execute /usr/bin/gs
319 -RDEPEND="jbig? ( media-libs/jbigkit:= )
320 - jpeg? ( virtual/jpeg:0 )
321 - png? (
322 - >=media-libs/libpng-1.4:0=
323 - sys-libs/zlib
324 - )
325 - postscript? (
326 - app-text/ghostscript-gpl
327 - sys-libs/zlib
328 - )
329 - rle? ( media-libs/urt:= )
330 - svga? ( media-libs/svgalib )
331 - tiff? ( >=media-libs/tiff-3.5.5:0 )
332 - xml? ( dev-libs/libxml2 )
333 - X? ( x11-libs/libX11 )"
334 -DEPEND="${RDEPEND}"
335 -
336 -PATCHES=(
337 - "${FILESDIR}"/netpbm-10.86.21-build.patch
338 - "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
339 - "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
340 - "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
341 -)
342 -
343 -netpbm_libtype() {
344 - case ${CHOST} in
345 - *-darwin*) echo dylib;;
346 - *) echo unixshared;;
347 - esac
348 -}
349 -
350 -netpbm_libsuffix() {
351 - local suffix=$(get_libname)
352 - echo ${suffix//\.}
353 -}
354 -
355 -netpbm_ldshlib() {
356 - case ${CHOST} in
357 - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
358 - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
359 - esac
360 -}
361 -netpbm_config() {
362 - if use ${1} ; then
363 - [[ ${2} != "!" ]] && echo -l${2:-$1}
364 - else
365 - echo NONE
366 - fi
367 -}
368 -
369 -# for bug #828127
370 -netpbm_cflags_for_build() {
371 - if is-flagq -fPIC; then
372 - echo -fPIC
373 - fi
374 -}
375 -
376 -src_prepare() {
377 - default
378 -
379 - # make sure we use system libs
380 - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
381 - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
382 -
383 - # take care of the importinc stuff ourselves by only doing it once
384 - # at the top level and having all subdirs use that one set #149843
385 - sed -i \
386 - -e '/^importinc:/s|^|importinc:\nmanual_|' \
387 - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
388 - common.mk || die
389 - sed -i \
390 - -e '/%.c/s: importinc$::' \
391 - common.mk lib/Makefile lib/util/Makefile || die
392 - sed -i \
393 - -e 's:pkg-config:$(PKG_CONFIG):' \
394 - GNUmakefile converter/other/Makefile other/pamx/Makefile || die
395 -
396 - # The postscript knob is currently bound up with a fork test.
397 - if ! use postscript ; then
398 - sed -i \
399 - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
400 - converter/other/Makefile generator/Makefile || die
401 - sed -i -r \
402 - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
403 - test/all-in-place.{ok,test} || die
404 - sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
405 - sed -i -e '/^$/d' test/all-in-place.ok || die
406 - sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
407 - fi
408 -
409 - # the new postscript test needs +x
410 - chmod +x test/lps-roundtrip.test
411 -
412 - # Do not test png if not built
413 - if ! use png ; then
414 - sed -i -r \
415 - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
416 - test/all-in-place.{ok,test} || die
417 - sed -i -e '/^$/d' test/all-in-place.ok || die
418 -
419 - sed -i -r \
420 - -e 's:(pamrgbatopng|pngtopnm).*::' \
421 - test/legacy-names.{ok,test} || die
422 - sed -i -e '/^$/d' test/legacy-names.ok || die
423 - sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
424 - fi
425 -}
426 -
427 -src_configure() {
428 - # cannot chain the die with the heredoc
429 - # repoman tries to parse the heredoc and fails
430 - cat config.mk.in - >> config.mk <<-EOF
431 - # Misc crap
432 - BUILD_FIASCO = N
433 - SYMLINK = ln -sf
434 -
435 - # These vars let src_test work by default
436 - PKGDIR_DEFAULT = ${T}/netpbm
437 - RESULTDIR_DEFAULT = ${T}/netpbm-test
438 -
439 - # Toolchain options
440 - CC = $(tc-getCC) -Wall
441 - LD = \$(CC)
442 - CC_FOR_BUILD = $(tc-getBUILD_CC)
443 - LD_FOR_BUILD = \$(CC_FOR_BUILD)
444 - AR = $(tc-getAR)
445 - RANLIB = $(tc-getRANLIB)
446 - PKG_CONFIG = $(tc-getPKG_CONFIG)
447 -
448 - STRIPFLAG =
449 - CFLAGS_SHLIB = -fPIC
450 - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
451 -
452 - LDRELOC = \$(LD) -r
453 - LDSHLIB = $(netpbm_ldshlib)
454 - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
455 - LINKERISCOMPILER = Y
456 - NETPBMLIBSUFFIX = $(netpbm_libsuffix)
457 - NETPBMLIBTYPE = $(netpbm_libtype)
458 - STATICLIB_TOO = $(usex static-libs Y N)
459 -
460 - # The var is called SSE, but the code is actually SSE2.
461 - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
462 -
463 - # Gentoo build options
464 - TIFFLIB = $(netpbm_config tiff)
465 - # Let tiff worry about its own dependencies #395753
466 - TIFFLIB_NEEDS_JPEG = N
467 - TIFFLIB_NEEDS_Z = N
468 - JPEGLIB = $(netpbm_config jpeg)
469 - PNGLIB = $(netpbm_config png)
470 - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
471 - LINUXSVGALIB = $(netpbm_config svga vga)
472 - XML2_LIBS = $(netpbm_config xml xml2)
473 - JBIGLIB = $(netpbm_config jbig)
474 - JBIGHDR_DIR =
475 - JASPERLIB = NONE
476 - JASPERHDR_DIR =
477 - URTLIB = $(netpbm_config rle)
478 - URTHDR_DIR =
479 - X11LIB = $(netpbm_config X X11)
480 - X11HDR_DIR =
481 - EOF
482 - [[ $? -eq 0 ]] || die "writing config.mk failed"
483 -}
484 -
485 -src_compile() {
486 - emake -j1 pm_config.h version.h manual_importinc #149843
487 - emake
488 -}
489 -
490 -src_test() {
491 - # The code wants to install everything first and then test the result.
492 - emake install.{bin,lib,data}
493 - emake check
494 -}
495 -
496 -src_install() {
497 - # Subdir make targets like to use `mkdir` all over the place
498 - # without any actual dependencies, thus the -j1.
499 - emake -j1 package pkgdir="${ED}"/usr
500 -
501 - if [[ $(get_libdir) != "lib" ]] ; then
502 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
503 - fi
504 -
505 - # Remove cruft that we don't need, and move around stuff we want
506 - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
507 -
508 - dodir /usr/share
509 - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
510 -
511 - doman userguide/*.[0-9]
512 - dodoc README
513 -
514 - cd doc || die
515 - dodoc HISTORY Netpbm.programming USERDOC
516 - docinto html
517 - dodoc -r *.html
518 -
519 - use doc && dodoc -r ../userguide/*.html
520 -}
521
522 diff --git a/media-libs/netpbm/netpbm-10.86.30.ebuild b/media-libs/netpbm/netpbm-10.86.30.ebuild
523 deleted file mode 100644
524 index 08e5db5c969b..000000000000
525 --- a/media-libs/netpbm/netpbm-10.86.30.ebuild
526 +++ /dev/null
527 @@ -1,229 +0,0 @@
528 -# Copyright 1999-2022 Gentoo Authors
529 -# Distributed under the terms of the GNU General Public License v2
530 -
531 -EAPI=8
532 -
533 -inherit flag-o-matic multilib toolchain-funcs
534 -
535 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
536 -HOMEPAGE="http://netpbm.sourceforge.net/"
537 -SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
538 -
539 -LICENSE="GPL-2"
540 -SLOT="0"
541 -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
542 -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
543 -
544 -BDEPEND="
545 - app-arch/xz-utils
546 - sys-devel/flex
547 - virtual/pkgconfig
548 -"
549 -# app-text/ghostscript-gpl is really needed for postscript
550 -# some utilities execute /usr/bin/gs
551 -RDEPEND="jbig? ( media-libs/jbigkit:= )
552 - jpeg? ( virtual/jpeg:0 )
553 - png? (
554 - >=media-libs/libpng-1.4:0=
555 - sys-libs/zlib
556 - )
557 - postscript? (
558 - app-text/ghostscript-gpl
559 - sys-libs/zlib
560 - )
561 - rle? ( media-libs/urt:= )
562 - svga? ( media-libs/svgalib )
563 - tiff? ( >=media-libs/tiff-3.5.5:0 )
564 - xml? ( dev-libs/libxml2 )
565 - X? ( x11-libs/libX11 )"
566 -DEPEND="${RDEPEND}"
567 -
568 -PATCHES=(
569 - "${FILESDIR}"/netpbm-10.86.21-build.patch
570 - "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
571 - "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
572 - "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
573 -)
574 -
575 -netpbm_libtype() {
576 - case ${CHOST} in
577 - *-darwin*) echo dylib;;
578 - *) echo unixshared;;
579 - esac
580 -}
581 -
582 -netpbm_libsuffix() {
583 - local suffix=$(get_libname)
584 - echo ${suffix//\.}
585 -}
586 -
587 -netpbm_ldshlib() {
588 - case ${CHOST} in
589 - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
590 - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
591 - esac
592 -}
593 -netpbm_config() {
594 - if use ${1} ; then
595 - [[ ${2} != "!" ]] && echo -l${2:-$1}
596 - else
597 - echo NONE
598 - fi
599 -}
600 -
601 -# for bug #828127
602 -netpbm_cflags_for_build() {
603 - if is-flagq -fPIC; then
604 - echo -fPIC
605 - fi
606 -}
607 -
608 -src_prepare() {
609 - default
610 -
611 - # make sure we use system libs
612 - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
613 - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
614 -
615 - # take care of the importinc stuff ourselves by only doing it once
616 - # at the top level and having all subdirs use that one set #149843
617 - sed -i \
618 - -e '/^importinc:/s|^|importinc:\nmanual_|' \
619 - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
620 - common.mk || die
621 - sed -i \
622 - -e '/%.c/s: importinc$::' \
623 - common.mk lib/Makefile lib/util/Makefile || die
624 - sed -i \
625 - -e 's:pkg-config:$(PKG_CONFIG):' \
626 - GNUmakefile converter/other/Makefile other/pamx/Makefile || die
627 -
628 - # The postscript knob is currently bound up with a fork test.
629 - if ! use postscript ; then
630 - sed -i \
631 - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
632 - converter/other/Makefile generator/Makefile || die
633 - sed -i -r \
634 - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
635 - test/all-in-place.{ok,test} || die
636 - sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
637 - sed -i -e '/^$/d' test/all-in-place.ok || die
638 - sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
639 - fi
640 -
641 - # the new postscript test needs +x
642 - chmod +x test/lps-roundtrip.test
643 -
644 - # Do not test png if not built
645 - if ! use png ; then
646 - sed -i -r \
647 - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
648 - test/all-in-place.{ok,test} || die
649 - sed -i -e '/^$/d' test/all-in-place.ok || die
650 -
651 - sed -i -r \
652 - -e 's:(pamrgbatopng|pngtopnm).*::' \
653 - test/legacy-names.{ok,test} || die
654 - sed -i -e '/^$/d' test/legacy-names.ok || die
655 - sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
656 - fi
657 -
658 - # this test requires LC_ALL=en_US.iso88591, not available on musl
659 - if use elibc_musl; then
660 - sed -i -e 's:pbmtext-iso88591.*::' test/Test-Order || die
661 - fi
662 -}
663 -
664 -src_configure() {
665 - # cannot chain the die with the heredoc
666 - # repoman tries to parse the heredoc and fails
667 - cat config.mk.in - >> config.mk <<-EOF
668 - # Misc crap
669 - BUILD_FIASCO = N
670 - SYMLINK = ln -sf
671 -
672 - # These vars let src_test work by default
673 - PKGDIR_DEFAULT = ${T}/netpbm
674 - RESULTDIR_DEFAULT = ${T}/netpbm-test
675 -
676 - # Toolchain options
677 - CC = $(tc-getCC) -Wall
678 - LD = \$(CC)
679 - CC_FOR_BUILD = $(tc-getBUILD_CC)
680 - LD_FOR_BUILD = \$(CC_FOR_BUILD)
681 - AR = $(tc-getAR)
682 - RANLIB = $(tc-getRANLIB)
683 - PKG_CONFIG = $(tc-getPKG_CONFIG)
684 -
685 - STRIPFLAG =
686 - CFLAGS_SHLIB = -fPIC
687 - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
688 -
689 - LDRELOC = \$(LD) -r
690 - LDSHLIB = $(netpbm_ldshlib)
691 - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
692 - LINKERISCOMPILER = Y
693 - NETPBMLIBSUFFIX = $(netpbm_libsuffix)
694 - NETPBMLIBTYPE = $(netpbm_libtype)
695 - STATICLIB_TOO = $(usex static-libs Y N)
696 -
697 - # The var is called SSE, but the code is actually SSE2.
698 - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
699 -
700 - # Gentoo build options
701 - TIFFLIB = $(netpbm_config tiff)
702 - # Let tiff worry about its own dependencies #395753
703 - TIFFLIB_NEEDS_JPEG = N
704 - TIFFLIB_NEEDS_Z = N
705 - JPEGLIB = $(netpbm_config jpeg)
706 - PNGLIB = $(netpbm_config png)
707 - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
708 - LINUXSVGALIB = $(netpbm_config svga vga)
709 - XML2_LIBS = $(netpbm_config xml xml2)
710 - JBIGLIB = $(netpbm_config jbig)
711 - JBIGHDR_DIR =
712 - JASPERLIB = NONE
713 - JASPERHDR_DIR =
714 - URTLIB = $(netpbm_config rle)
715 - URTHDR_DIR =
716 - X11LIB = $(netpbm_config X X11)
717 - X11HDR_DIR =
718 - EOF
719 - [[ $? -eq 0 ]] || die "writing config.mk failed"
720 -}
721 -
722 -src_compile() {
723 - emake -j1 pm_config.h version.h manual_importinc #149843
724 - emake
725 -}
726 -
727 -src_test() {
728 - # The code wants to install everything first and then test the result.
729 - emake install.{bin,lib,data}
730 - emake check
731 -}
732 -
733 -src_install() {
734 - # Subdir make targets like to use `mkdir` all over the place
735 - # without any actual dependencies, thus the -j1.
736 - emake -j1 package pkgdir="${ED}"/usr
737 -
738 - if [[ $(get_libdir) != "lib" ]] ; then
739 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
740 - fi
741 -
742 - # Remove cruft that we don't need, and move around stuff we want
743 - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
744 -
745 - dodir /usr/share
746 - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
747 -
748 - doman userguide/*.[0-9]
749 - dodoc README
750 -
751 - cd doc || die
752 - dodoc HISTORY Netpbm.programming USERDOC
753 - docinto html
754 - dodoc -r *.html
755 - dodoc -r ../userguide/*.html
756 -}