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