Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/
Date: Thu, 04 Apr 2019 19:22:09
Message-Id: 1554405675.e89aa3a6c1d3e66f3678c71bee446991d28c0c0e.bman@gentoo
1 commit: e89aa3a6c1d3e66f3678c71bee446991d28c0c0e
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 4 19:21:15 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 4 19:21:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89aa3a6
7
8 app-text/ghostscript-gpl: drop vulnerable wrt bug #668846
9
10 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
11
12 app-text/ghostscript-gpl/Manifest | 2 -
13 .../ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild | 200 --------------------
14 .../ghostscript-gpl/ghostscript-gpl-9.25.ebuild | 206 ---------------------
15 3 files changed, 408 deletions(-)
16
17 diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
18 index 985436cf4f5..0c90c42ed8e 100644
19 --- a/app-text/ghostscript-gpl/Manifest
20 +++ b/app-text/ghostscript-gpl/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b270107f4063b299175f5c08e5e7ace2468e1512a297464fda5695c830808916e6a0dd1202ca7e85b32cfd175d8cc2b18 SHA512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651
23 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
24 -DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
25 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
26
27 diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
28 deleted file mode 100644
29 index 29eea9194c5..00000000000
30 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
31 +++ /dev/null
32 @@ -1,200 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit autotools flag-o-matic toolchain-funcs
39 -
40 -DESCRIPTION="Interpreter for the PostScript language and PDF"
41 -HOMEPAGE="https://ghostscript.com/"
42 -
43 -MY_P=${P/-gpl}
44 -PVM=$(ver_cut 1-2)
45 -PVM_S=$(ver_rs 1-2 "")
46 -
47 -MY_PATCHSET=1
48 -
49 -SRC_URI="
50 - https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
51 - https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
52 -"
53 -
54 -LICENSE="AGPL-3 CPL-1.0"
55 -SLOT="0"
56 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
57 -IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
58 -
59 -LANGS="ja ko zh-CN zh-TW"
60 -for X in ${LANGS} ; do
61 - IUSE="${IUSE} l10n_${X}"
62 -done
63 -
64 -DEPEND="
65 - app-text/libpaper
66 - media-libs/fontconfig
67 - >=media-libs/freetype-2.4.9:2=
68 - media-libs/jbig2dec
69 - >=media-libs/lcms-2.6:2
70 - >=media-libs/libpng-1.6.2:0=
71 - >=media-libs/openjpeg-2.1.0:2=
72 - >=sys-libs/zlib-1.2.7
73 - virtual/jpeg:0
74 - cups? ( >=net-print/cups-1.3.8 )
75 - dbus? ( sys-apps/dbus )
76 - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
77 - unicode? ( net-dns/libidn:= )
78 - tiff? ( >=media-libs/tiff-4.0.1:0= )
79 - X? ( x11-libs/libXt x11-libs/libXext )
80 -"
81 -BDEPEND="virtual/pkgconfig"
82 -RDEPEND="${DEPEND}
83 - app-text/poppler-data
84 - >=media-fonts/urw-fonts-2.4.9
85 - l10n_ja? ( media-fonts/kochi-substitute )
86 - l10n_ko? ( media-fonts/baekmuk-fonts )
87 - l10n_zh-CN? ( media-fonts/arphicfonts )
88 - l10n_zh-TW? ( media-fonts/arphicfonts )
89 -"
90 -
91 -S="${WORKDIR}/${MY_P}"
92 -
93 -PATCHES=(
94 - "${FILESDIR}/${P}-no-gtk3.patch" # bug 668160
95 -)
96 -
97 -src_prepare() {
98 - # apply various patches, many borrowed from Fedora
99 - # http://pkgs.fedoraproject.org/cgit/ghostscript.git
100 - eapply "${WORKDIR}/patches/"*.patch
101 - default
102 -
103 - # remove internal copies of various libraries
104 - rm -r cups/libs || die
105 - rm -r freetype || die
106 - rm -r jbig2dec || die
107 - rm -r jpeg || die
108 - rm -r lcms2mt || die
109 - rm -r libpng || die
110 - rm -r tiff || die
111 - rm -r zlib || die
112 - rm -r openjpeg || die
113 - # remove internal CMaps (CMaps from poppler-data are used instead)
114 - rm -r Resource/CMap || die
115 -
116 - if ! use gtk ; then
117 - sed -e "s:\$(GSSOX)::" \
118 - -e "s:.*\$(GSSOX_XENAME)$::" \
119 - -i base/unix-dll.mak || die "sed failed"
120 - fi
121 -
122 - # Force the include dirs to a neutral location.
123 - sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
124 - -i configure.ac || die
125 - # Some files depend on zlib.h directly. Redirect them. #573248
126 - # Also make sure to not define OPJ_STATIC to avoid linker errors due to
127 - # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
128 - sed -e '/^zlib_h/s:=.*:=:' \
129 - -e 's|-DOPJ_STATIC ||' \
130 - -i base/lib.mak || die
131 -
132 - # search path fix
133 - # put LDFLAGS after BINDIR, bug #383447
134 - sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
135 - -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
136 - -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
137 - -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
138 - -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
139 - -i Makefile.in base/*.mak || die "sed failed"
140 -
141 - # remove incorrect symlink, bug 590384
142 - rm ijs/ltmain.sh || die
143 - eautoreconf
144 -
145 - cd ijs || die
146 - eautoreconf
147 -}
148 -
149 -src_configure() {
150 - local FONTPATH
151 - for path in \
152 - "${EPREFIX}"/usr/share/fonts/urw-fonts \
153 - "${EPREFIX}"/usr/share/fonts/Type1 \
154 - "${EPREFIX}"/usr/share/fonts \
155 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
156 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
157 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
158 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
159 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
160 - do
161 - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
162 - done
163 -
164 - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
165 - econf \
166 - --enable-dynamic \
167 - --enable-freetype \
168 - --enable-fontconfig \
169 - --enable-openjpeg \
170 - --disable-compile-inits \
171 - --with-drivers=ALL \
172 - --with-fontpath="$FONTPATH" \
173 - --with-ijs \
174 - --with-jbig2dec \
175 - --with-libpaper \
176 - --without-luratech \
177 - $(use_enable cups) \
178 - $(use_enable dbus) \
179 - $(use_enable gtk) \
180 - $(use_with cups pdftoraster) \
181 - $(use_with unicode libidn) \
182 - $(use_with tiff system-libtiff) \
183 - $(use_with X x)
184 -
185 - cd "${S}/ijs" || die
186 - econf \
187 - --enable-shared \
188 - $(use_enable static-libs static)
189 -}
190 -
191 -src_compile() {
192 - emake so all
193 -
194 - cd ijs || die
195 - emake
196 -}
197 -
198 -src_install() {
199 - emake DESTDIR="${D}" install-so install
200 -
201 - # move gsc to gs, bug #343447
202 - # gsc collides with gambit, bug #253064
203 - mv -f "${ED}"/usr/bin/{gsc,gs} || die
204 -
205 - cd "${S}/ijs" || die
206 - emake DESTDIR="${D}" install
207 -
208 - # rename the original cidfmap to cidfmap.GS
209 - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
210 -
211 - # install our own cidfmap to handle CJK fonts
212 - insinto /usr/share/ghostscript/${PVM}/Resource/Init
213 - doins \
214 - "${WORKDIR}/fontmaps/CIDFnmap" \
215 - "${WORKDIR}/fontmaps/cidfmap"
216 - for X in ${LANGS} ; do
217 - if use l10n_${X} ; then
218 - doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
219 - fi
220 - done
221 -
222 - # install the CMaps from poppler-data properly, bug #409361
223 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
224 -
225 - if ! use static-libs; then
226 - find "${ED}" -name '*.la' -delete || die
227 - fi
228 -
229 - if ! use l10n_de; then
230 - rm -r "${ED}"/usr/share/man/de || die
231 - fi
232 -}
233
234 diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
235 deleted file mode 100644
236 index 5aabd4e86a3..00000000000
237 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
238 +++ /dev/null
239 @@ -1,206 +0,0 @@
240 -# Copyright 1999-2018 Gentoo Authors
241 -# Distributed under the terms of the GNU General Public License v2
242 -
243 -EAPI=6
244 -
245 -inherit autotools multilib versionator flag-o-matic toolchain-funcs
246 -
247 -DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
248 -HOMEPAGE="https://ghostscript.com/"
249 -
250 -MY_P=${P/-gpl}
251 -PVM=$(get_version_component_range 1-2)
252 -PVM_S=$(replace_all_version_separators "" ${PVM})
253 -
254 -MY_PATCHSET=1
255 -
256 -SRC_URI="
257 - https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
258 - https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
259 -"
260 -
261 -LICENSE="AGPL-3 CPL-1.0"
262 -SLOT="0"
263 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
264 -IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
265 -
266 -COMMON_DEPEND="
267 - app-text/libpaper
268 - media-libs/fontconfig
269 - >=media-libs/freetype-2.4.9:2=
270 - media-libs/jbig2dec
271 - >=media-libs/lcms-2.6:2
272 - >=media-libs/libpng-1.6.2:0=
273 - >=media-libs/openjpeg-2.1.0:2=
274 - >=sys-libs/zlib-1.2.7:=
275 - virtual/jpeg:0
276 - cups? ( >=net-print/cups-1.3.8 )
277 - dbus? ( sys-apps/dbus )
278 - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
279 - unicode? ( net-dns/libidn:= )
280 - tiff? ( >=media-libs/tiff-4.0.1:0= )
281 - X? ( x11-libs/libXt x11-libs/libXext )
282 -"
283 -
284 -DEPEND="${COMMON_DEPEND}
285 - virtual/pkgconfig
286 -"
287 -
288 -RDEPEND="${COMMON_DEPEND}
289 - >=app-text/poppler-data-0.4.5-r1
290 - >=media-fonts/urw-fonts-2.4.9
291 - l10n_ja? ( media-fonts/kochi-substitute )
292 - l10n_ko? ( media-fonts/baekmuk-fonts )
293 - l10n_zh-CN? ( media-fonts/arphicfonts )
294 - l10n_zh-TW? ( media-fonts/arphicfonts )
295 - !!media-fonts/gnu-gs-fonts-std
296 - !!media-fonts/gnu-gs-fonts-other
297 - !<net-print/cups-filters-1.0.36-r2
298 -"
299 -
300 -S="${WORKDIR}/${MY_P}"
301 -
302 -LANGS="ja ko zh-CN zh-TW"
303 -for X in ${LANGS} ; do
304 - IUSE="${IUSE} l10n_${X}"
305 -done
306 -
307 -src_prepare() {
308 - default
309 -
310 - # remove internal copies of various libraries
311 - rm -rf "${S}"/cups/libs || die
312 - rm -rf "${S}"/expat || die
313 - rm -rf "${S}"/freetype || die
314 - rm -rf "${S}"/jbig2dec || die
315 - rm -rf "${S}"/jpeg{,xr} || die
316 - rm -rf "${S}"/lcms{,2} || die
317 - rm -rf "${S}"/libpng || die
318 - rm -rf "${S}"/tiff || die
319 - rm -rf "${S}"/zlib || die
320 - rm -rf "${S}"/openjpeg || die
321 - # remove internal CMaps (CMaps from poppler-data are used instead)
322 - rm -rf "${S}"/Resource/CMap || die
323 -
324 - # apply various patches, many borrowed from Fedora
325 - # http://pkgs.fedoraproject.org/cgit/ghostscript.git
326 - eapply "${WORKDIR}/patches/"*.patch
327 -
328 - if ! use gtk ; then
329 - sed -i -e "s:\$(GSSOX)::" \
330 - -e "s:.*\$(GSSOX_XENAME)$::" \
331 - "${S}"/base/unix-dll.mak || die "sed failed"
332 - fi
333 -
334 - # Force the include dirs to a neutral location.
335 - sed -i \
336 - -e "/^ZLIBDIR=/s:=.*:=${T}:" \
337 - configure.ac || die
338 - # Some files depend on zlib.h directly. Redirect them. #573248
339 - # Also make sure to not define OPJ_STATIC to avoid linker errors due to
340 - # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
341 - sed -i \
342 - -e '/^zlib_h/s:=.*:=:' \
343 - -e 's|-DOPJ_STATIC ||' \
344 - base/lib.mak || die
345 -
346 - # search path fix
347 - # put LDFLAGS after BINDIR, bug #383447
348 - sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
349 - -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
350 - -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
351 - -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
352 - -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
353 - "${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
354 -
355 - cd "${S}" || die
356 - # remove incorrect symlink, bug 590384
357 - rm -f ijs/ltmain.sh || die
358 - eautoreconf
359 -
360 - cd "${S}/ijs" || die
361 - eautoreconf
362 -}
363 -
364 -src_configure() {
365 - local FONTPATH
366 - for path in \
367 - "${EPREFIX}"/usr/share/fonts/urw-fonts \
368 - "${EPREFIX}"/usr/share/fonts/Type1 \
369 - "${EPREFIX}"/usr/share/fonts \
370 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
371 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
372 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
373 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
374 - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
375 - do
376 - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
377 - done
378 -
379 - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
380 - econf \
381 - --enable-dynamic \
382 - --enable-freetype \
383 - --enable-fontconfig \
384 - --enable-openjpeg \
385 - --disable-compile-inits \
386 - --with-drivers=ALL \
387 - --with-fontpath="$FONTPATH" \
388 - --with-ijs \
389 - --with-jbig2dec \
390 - --with-libpaper \
391 - --without-luratech \
392 - $(use_enable cups) \
393 - $(use_enable dbus) \
394 - $(use_enable gtk) \
395 - $(use_with cups pdftoraster) \
396 - $(use_with unicode libidn) \
397 - $(use_with tiff system-libtiff) \
398 - $(use_with X x)
399 -
400 - cd "${S}/ijs" || die
401 - econf \
402 - --enable-shared \
403 - $(use_enable static-libs static)
404 -}
405 -
406 -src_compile() {
407 - emake so all
408 -
409 - cd "${S}/ijs" || die
410 - emake
411 -}
412 -
413 -src_install() {
414 - emake DESTDIR="${D}" install-so install
415 -
416 - # move gsc to gs, bug #343447
417 - # gsc collides with gambit, bug #253064
418 - mv -f "${ED}"/usr/bin/{gsc,gs} || die
419 -
420 - cd "${S}/ijs" || die
421 - emake DESTDIR="${D}" install
422 -
423 - # rename the original cidfmap to cidfmap.GS
424 - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
425 -
426 - # install our own cidfmap to handle CJK fonts
427 - insinto /usr/share/ghostscript/${PVM}/Resource/Init
428 - doins \
429 - "${WORKDIR}/fontmaps/CIDFnmap" \
430 - "${WORKDIR}/fontmaps/cidfmap"
431 - for X in ${LANGS} ; do
432 - if use l10n_${X} ; then
433 - doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
434 - fi
435 - done
436 -
437 - # install the CMaps from poppler-data properly, bug #409361
438 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
439 -
440 - use static-libs || find "${ED}" -name '*.la' -delete
441 -
442 - if ! use l10n_de; then
443 - rm -r "${ED}"/usr/share/man/de || die
444 - fi
445 -}