Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/
Date: Wed, 01 Dec 2021 06:06:39
Message-Id: 1638338344.30556ee2dba291651ffec7a55fce1a946f389918.ionen@gentoo
1 commit: 30556ee2dba291651ffec7a55fce1a946f389918
2 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
3 AuthorDate: Mon Nov 29 18:35:07 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 05:59:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30556ee2
7
8 media-libs/netpbm: drop v10.86.26
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/23117
13 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
14
15 media-libs/netpbm/Manifest | 1 -
16 media-libs/netpbm/netpbm-10.86.26-r1.ebuild | 220 ----------------------------
17 2 files changed, 221 deletions(-)
18
19 diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
20 index e59c3abb7e13..acb659885fd9 100644
21 --- a/media-libs/netpbm/Manifest
22 +++ b/media-libs/netpbm/Manifest
23 @@ -1,4 +1,3 @@
24 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
25 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
26 -DIST netpbm-10.86.26.tar.xz 3699572 BLAKE2B d0b3fccfecea20a7979a6b29dac670dc33616a6cdd6f985af76cbd0d8125b887ad2dfc193e5e59f47014f685887cadeebcdce0da8db0a219457bb88caf42ba62 SHA512 23ca6125827c61648e0a475880efade7b83f87cfc884361c1f706f0a69ac70b5a7a2ae4699c77e21eda1c73241768b1bd7e595d5d533eeb10b7f69a79c7ae69d
27 DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
28
29 diff --git a/media-libs/netpbm/netpbm-10.86.26-r1.ebuild b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
30 deleted file mode 100644
31 index 39873d62dbfd..000000000000
32 --- a/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
33 +++ /dev/null
34 @@ -1,220 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=8
39 -
40 -inherit multilib toolchain-funcs
41 -
42 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
43 -HOMEPAGE="http://netpbm.sourceforge.net/"
44 -SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
49 -IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
50 -# zlib USE flag is no longer used, enabled by default.
51 -# cannot remove it yet because of #801445
52 -
53 -BDEPEND="
54 - app-arch/xz-utils
55 - sys-devel/flex
56 - virtual/pkgconfig
57 -"
58 -# app-text/ghostscript-gpl is really needed for postscript
59 -# some utilities execute /usr/bin/gs
60 -RDEPEND="jbig? ( media-libs/jbigkit:= )
61 - jpeg? ( virtual/jpeg:0 )
62 - png? (
63 - >=media-libs/libpng-1.4:0=
64 - sys-libs/zlib
65 - )
66 - postscript? (
67 - app-text/ghostscript-gpl
68 - sys-libs/zlib
69 - )
70 - rle? ( media-libs/urt:= )
71 - svga? ( media-libs/svgalib )
72 - tiff? ( >=media-libs/tiff-3.5.5:0 )
73 - xml? ( dev-libs/libxml2 )
74 - X? ( x11-libs/libX11 )"
75 -DEPEND="${RDEPEND}"
76 -
77 -PATCHES=(
78 - "${FILESDIR}"/netpbm-10.86.21-build.patch
79 - "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
80 - "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
81 - "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
82 - "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
83 -)
84 -
85 -netpbm_libtype() {
86 - case ${CHOST} in
87 - *-darwin*) echo dylib;;
88 - *) echo unixshared;;
89 - esac
90 -}
91 -
92 -netpbm_libsuffix() {
93 - local suffix=$(get_libname)
94 - echo ${suffix//\.}
95 -}
96 -
97 -netpbm_ldshlib() {
98 - case ${CHOST} in
99 - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
100 - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
101 - esac
102 -}
103 -netpbm_config() {
104 - if use ${1} ; then
105 - [[ ${2} != "!" ]] && echo -l${2:-$1}
106 - else
107 - echo NONE
108 - fi
109 -}
110 -
111 -src_prepare() {
112 - default
113 -
114 - # make sure we use system libs
115 - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
116 - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
117 -
118 - # take care of the importinc stuff ourselves by only doing it once
119 - # at the top level and having all subdirs use that one set #149843
120 - sed -i \
121 - -e '/^importinc:/s|^|importinc:\nmanual_|' \
122 - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
123 - common.mk || die
124 - sed -i \
125 - -e '/%.c/s: importinc$::' \
126 - common.mk lib/Makefile lib/util/Makefile || die
127 - sed -i \
128 - -e 's:pkg-config:$(PKG_CONFIG):' \
129 - GNUmakefile converter/other/Makefile other/pamx/Makefile || die
130 -
131 - # The postscript knob is currently bound up with a fork test.
132 - if ! use postscript ; then
133 - sed -i \
134 - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
135 - converter/other/Makefile generator/Makefile || die
136 - sed -i -r \
137 - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
138 - test/all-in-place.{ok,test} || die
139 - sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
140 - sed -i -e '/^$/d' test/all-in-place.ok || die
141 - sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
142 - fi
143 -
144 - # the new postscript test needs +x
145 - chmod +x test/lps-roundtrip.test
146 -
147 - # Do not test png if not built
148 - if ! use png ; then
149 - sed -i -r \
150 - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \
151 - test/all-in-place.{ok,test} || die
152 - sed -i -e '/^$/d' test/all-in-place.ok || die
153 -
154 - sed -i -r \
155 - -e 's:(pamrgbatopng|pngtopnm).*::' \
156 - test/legacy-names.{ok,test} || die
157 - sed -i -e '/^$/d' test/legacy-names.ok || die
158 - sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
159 - fi
160 -}
161 -
162 -src_configure() {
163 - # cannot chain the die with the heredoc
164 - # repoman tries to parse the heredoc and fails
165 - cat config.mk.in - >> config.mk <<-EOF
166 - # Misc crap
167 - BUILD_FIASCO = N
168 - SYMLINK = ln -sf
169 -
170 - # These vars let src_test work by default
171 - PKGDIR_DEFAULT = ${T}/netpbm
172 - RESULTDIR_DEFAULT = ${T}/netpbm-test
173 -
174 - # Toolchain options
175 - CC = $(tc-getCC) -Wall
176 - LD = \$(CC)
177 - CC_FOR_BUILD = $(tc-getBUILD_CC)
178 - LD_FOR_BUILD = \$(CC_FOR_BUILD)
179 - AR = $(tc-getAR)
180 - RANLIB = $(tc-getRANLIB)
181 - PKG_CONFIG = $(tc-getPKG_CONFIG)
182 -
183 - STRIPFLAG =
184 - CFLAGS_SHLIB = -fPIC
185 -
186 - LDRELOC = \$(LD) -r
187 - LDSHLIB = $(netpbm_ldshlib)
188 - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
189 - LINKERISCOMPILER = Y
190 - NETPBMLIBSUFFIX = $(netpbm_libsuffix)
191 - NETPBMLIBTYPE = $(netpbm_libtype)
192 - STATICLIB_TOO = $(usex static-libs Y N)
193 -
194 - # The var is called SSE, but the code is actually SSE2.
195 - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
196 -
197 - # Gentoo build options
198 - TIFFLIB = $(netpbm_config tiff)
199 - # Let tiff worry about its own dependencies #395753
200 - TIFFLIB_NEEDS_JPEG = N
201 - TIFFLIB_NEEDS_Z = N
202 - JPEGLIB = $(netpbm_config jpeg)
203 - PNGLIB = $(netpbm_config png)
204 - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
205 - LINUXSVGALIB = $(netpbm_config svga vga)
206 - XML2_LIBS = $(netpbm_config xml xml2)
207 - JBIGLIB = $(netpbm_config jbig)
208 - JBIGHDR_DIR =
209 - JASPERLIB = NONE
210 - JASPERHDR_DIR =
211 - URTLIB = $(netpbm_config rle)
212 - URTHDR_DIR =
213 - X11LIB = $(netpbm_config X X11)
214 - X11HDR_DIR =
215 - EOF
216 - [[ $? -eq 0 ]] || die "writing config.mk failed"
217 -}
218 -
219 -src_compile() {
220 - emake -j1 pm_config.h version.h manual_importinc #149843
221 - emake
222 -}
223 -
224 -src_test() {
225 - # The code wants to install everything first and then test the result.
226 - emake install.{bin,lib,data}
227 - emake check
228 -}
229 -
230 -src_install() {
231 - # Subdir make targets like to use `mkdir` all over the place
232 - # without any actual dependencies, thus the -j1.
233 - emake -j1 package pkgdir="${ED}"/usr
234 -
235 - if [[ $(get_libdir) != "lib" ]] ; then
236 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
237 - fi
238 -
239 - # Remove cruft that we don't need, and move around stuff we want
240 - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
241 -
242 - dodir /usr/share
243 - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
244 -
245 - doman userguide/*.[0-9]
246 - dodoc README
247 -
248 - cd doc || die
249 - dodoc HISTORY Netpbm.programming USERDOC
250 - docinto html
251 - dodoc -r *.html
252 -
253 - use doc && dodoc -r ../userguide/*.html
254 -}