Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/
Date: Fri, 25 Sep 2020 19:41:15
Message-Id: 1601062864.9eb0c0864e6903267b49f70394c129eb525d6729.bman@gentoo
1 commit: 9eb0c0864e6903267b49f70394c129eb525d6729
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 19:33:20 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 19:41:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb0c086
7
8 media-libs/netpbm: drop old EAPI=4
9
10 Bug: https://bugs.gentoo.org/671068
11 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
12
13 media-libs/netpbm/Manifest | 1 -
14 media-libs/netpbm/netpbm-10.66.00.ebuild | 195 -------------------------------
15 2 files changed, 196 deletions(-)
16
17 diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
18 index 71d44985689..5519fbb6b9d 100644
19 --- a/media-libs/netpbm/Manifest
20 +++ b/media-libs/netpbm/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
23 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
24 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
25
26 diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
27 deleted file mode 100644
28 index 3091275a3a1..00000000000
29 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild
30 +++ /dev/null
31 @@ -1,195 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="4"
36 -
37 -inherit toolchain-funcs eutils multilib
38 -
39 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
40 -HOMEPAGE="http://netpbm.sourceforge.net/"
41 -SRC_URI="mirror://gentoo/${P}.tar.xz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
46 -IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
47 -
48 -RDEPEND="jbig? ( media-libs/jbigkit )
49 - jpeg? ( virtual/jpeg:0 )
50 - png? ( >=media-libs/libpng-1.4:0 )
51 - rle? ( media-libs/urt )
52 - svga? ( media-libs/svgalib )
53 - tiff? ( >=media-libs/tiff-3.5.5:0 )
54 - xml? ( dev-libs/libxml2 )
55 - zlib? ( sys-libs/zlib )
56 - X? ( x11-libs/libX11 )"
57 -DEPEND="${RDEPEND}
58 - app-arch/xz-utils
59 - sys-devel/flex"
60 -
61 -netpbm_libtype() {
62 - case ${CHOST} in
63 - *-darwin*) echo dylib;;
64 - *) echo unixshared;;
65 - esac
66 -}
67 -netpbm_libsuffix() {
68 - local suffix=$(get_libname)
69 - echo ${suffix//\.}
70 -}
71 -netpbm_ldshlib() {
72 - case ${CHOST} in
73 - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
74 - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
75 - esac
76 -}
77 -netpbm_config() {
78 - if use $1 ; then
79 - [[ $2 != "!" ]] && echo -l${2:-$1}
80 - else
81 - echo NONE
82 - fi
83 -}
84 -
85 -src_prepare() {
86 - epatch "${FILESDIR}"/netpbm-10.31-build.patch
87 - epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530
88 - epatch "${FILESDIR}"/netpbm-10.66-jasper-hack.patch #513240
89 - epatch "${FILESDIR}"/netpbm-10.66-options-case.patch
90 - epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch
91 - epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch
92 - epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch
93 - epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252
94 -
95 - # make sure we use system urt
96 - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
97 - rm -rf urt
98 -
99 - # avoid mixing the local copy of jbig with the system
100 - rm converter/other/jbig/jbig.h || die
101 -
102 - # disable certain tests based on active USE flags
103 - local del=(
104 - $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip')
105 - $(usex rle '' 'utahrle-roundtrip')
106 - $(usex tiff '' 'tiff-roundtrip')
107 - )
108 - if [[ ${#del[@]} -gt 0 ]] ; then
109 - sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
110 - fi
111 - del=(
112 - pnmtofiasco fiascotopnm # We always disable fiasco
113 - $(usex jbig '' 'jbigtopnm pnmtojbig')
114 - jpeg2ktopam pamtojpeg2k # jasper has been removed
115 - $(usex rle '' 'pnmtorle rletopnm')
116 - $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
117 - )
118 - if [[ ${#del[@]} -gt 0 ]] ; then
119 - sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
120 - sed -i '/^$/d' test/all-in-place.ok || die
121 - fi
122 -
123 - # take care of the importinc stuff ourselves by only doing it once
124 - # at the top level and having all subdirs use that one set #149843
125 - sed -i \
126 - -e '/^importinc:/s|^|importinc:\nmanual_|' \
127 - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
128 - common.mk || die
129 - sed -i \
130 - -e '/%.c/s: importinc$::' \
131 - common.mk lib/Makefile lib/util/Makefile || die
132 -
133 - # avoid ugly depend.mk warnings
134 - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
135 -}
136 -
137 -src_configure() {
138 - cat config.mk.in - >> config.mk <<-EOF
139 - # Misc crap
140 - BUILD_FIASCO = N
141 - SYMLINK = ln -sf
142 -
143 - # These vars let src_test work by default
144 - PKGDIR_DEFAULT = ${T}/netpbm
145 - RESULTDIR_DEFAULT = ${T}/netpbm-test
146 -
147 - # Toolchain options
148 - CC = $(tc-getCC) -Wall
149 - LD = \$(CC)
150 - CC_FOR_BUILD = $(tc-getBUILD_CC)
151 - LD_FOR_BUILD = \$(CC_FOR_BUILD)
152 - AR = $(tc-getAR)
153 - RANLIB = $(tc-getRANLIB)
154 -
155 - STRIPFLAG =
156 - CFLAGS_SHLIB = -fPIC
157 -
158 - LDRELOC = \$(LD) -r
159 - LDSHLIB = $(netpbm_ldshlib)
160 - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
161 - LINKERISCOMPILER = Y
162 - NETPBMLIBSUFFIX = $(netpbm_libsuffix)
163 - NETPBMLIBTYPE = $(netpbm_libtype)
164 - STATICLIB_TOO = $(usex static-libs Y N)
165 -
166 - # The var is called SSE, but the code is actually SSE2.
167 - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
168 -
169 - # Gentoo build options
170 - TIFFLIB = $(netpbm_config tiff)
171 - # Let tiff worry about its own dependencies #395753
172 - TIFFLIB_NEEDS_JPEG = N
173 - TIFFLIB_NEEDS_Z = N
174 - JPEGLIB = $(netpbm_config jpeg)
175 - PNGLIB = $(netpbm_config png)
176 - ZLIB = $(netpbm_config zlib z)
177 - LINUXSVGALIB = $(netpbm_config svga vga)
178 - XML2_LIBS = $(netpbm_config xml xml2)
179 - JBIGLIB = $(netpbm_config jbig)
180 - JBIGHDR_DIR =
181 - JASPERLIB = NONE
182 - JASPERHDR_DIR =
183 - URTLIB = $(netpbm_config rle)
184 - URTHDR_DIR =
185 - X11LIB = $(netpbm_config X X11)
186 - X11HDR_DIR =
187 - EOF
188 - # cannot chain the die with the heredoc above as bash-3
189 - # has a parser bug in that setup #282902
190 - [ $? -eq 0 ] || die "writing config.mk failed"
191 -}
192 -
193 -src_compile() {
194 - emake -j1 pm_config.h version.h manual_importinc #149843
195 - emake
196 -}
197 -
198 -src_test() {
199 - # The code wants to install everything first and then test the result.
200 - emake install.{bin,lib}
201 - emake check
202 -}
203 -
204 -src_install() {
205 - # Subdir make targets like to use `mkdir` all over the place
206 - # without any actual dependencies, thus the -j1.
207 - emake -j1 package pkgdir="${ED}"/usr
208 -
209 - [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
210 -
211 - # Remove cruft that we don't need, and move around stuff we want
212 - rm "${ED}"/usr/bin/{doc.url,manweb} || die
213 - rm -r "${ED}"/usr/man/web || die
214 - rm -r "${ED}"/usr/link || die
215 - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
216 - dodir /usr/share
217 - mv "${ED}"/usr/man "${ED}"/usr/share/ || die
218 - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
219 -
220 - doman userguide/*.[0-9]
221 - use doc && dohtml -r userguide
222 - dodoc README
223 - cd doc
224 - dodoc HISTORY Netpbm.programming USERDOC
225 - dohtml -r .
226 -}