Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/
Date: Wed, 28 Aug 2019 08:20:02
Message-Id: 1566980354.e863974540da5426763c0856241393715bb1d423.soap@gentoo
1 commit: e863974540da5426763c0856241393715bb1d423
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 28 08:19:14 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 28 08:19:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8639745
7
8 media-libs/netpbm: [QA] Remove media-libs/jasper dep
9
10 Bug: https://bugs.gentoo.org/689784
11 Package-Manager: Portage-2.3.68, Repoman-2.3.16
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 media-libs/netpbm/netpbm-10.66.00.ebuild | 9 ++++-----
15 media-libs/netpbm/netpbm-10.70.00.ebuild | 9 ++++-----
16 media-libs/netpbm/netpbm-10.76.00.ebuild | 5 ++---
17 3 files changed, 10 insertions(+), 13 deletions(-)
18
19 diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
20 index 9beba62062d..82fe3af2562 100644
21 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild
22 +++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2015 Gentoo Foundation
25 +# Copyright 1999-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI="4"
29 @@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
30 LICENSE="GPL-2"
31 SLOT="0"
32 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
33 -IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
34 +IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
35
36 RDEPEND="jbig? ( media-libs/jbigkit )
37 jpeg? ( virtual/jpeg:0 )
38 - jpeg2k? ( media-libs/jasper )
39 png? ( >=media-libs/libpng-1.4:0 )
40 rle? ( media-libs/urt )
41 svga? ( media-libs/svgalib )
42 @@ -81,7 +80,7 @@ src_prepare() {
43 del=(
44 pnmtofiasco fiascotopnm # We always disable fiasco
45 $(usex jbig '' 'jbigtopnm pnmtojbig')
46 - $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
47 + jpeg2ktopam pamtojpeg2k # jasper has been removed
48 $(usex rle '' 'pnmtorle rletopnm')
49 $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
50 )
51 @@ -148,7 +147,7 @@ src_configure() {
52 XML2_LIBS = $(netpbm_config xml xml2)
53 JBIGLIB = $(netpbm_config jbig)
54 JBIGHDR_DIR =
55 - JASPERLIB = $(netpbm_config jpeg2k jasper)
56 + JASPERLIB = NONE
57 JASPERHDR_DIR =
58 URTLIB = $(netpbm_config rle)
59 URTHDR_DIR =
60
61 diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
62 index d43ef5f78bf..97a05287f20 100644
63 --- a/media-libs/netpbm/netpbm-10.70.00.ebuild
64 +++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
65 @@ -1,4 +1,4 @@
66 -# Copyright 1999-2018 Gentoo Foundation
67 +# Copyright 1999-2019 Gentoo Authors
68 # Distributed under the terms of the GNU General Public License v2
69
70 EAPI="4"
71 @@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
72 LICENSE="GPL-2"
73 SLOT="0"
74 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
75 -IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
76 +IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
77
78 RDEPEND="jbig? ( media-libs/jbigkit )
79 jpeg? ( virtual/jpeg:0 )
80 - jpeg2k? ( media-libs/jasper )
81 png? ( >=media-libs/libpng-1.4:0 )
82 rle? ( media-libs/urt )
83 svga? ( media-libs/svgalib )
84 @@ -74,7 +73,7 @@ src_prepare() {
85 pnmtofiasco fiascotopnm # We always disable fiasco
86 $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
87 $(usex jbig '' 'jbigtopnm pnmtojbig')
88 - $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
89 + jpeg2ktopam pamtojpeg2k # jasper has been removed
90 $(usex rle '' 'pnmtorle rletopnm')
91 $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
92 )
93 @@ -141,7 +140,7 @@ src_configure() {
94 XML2_LIBS = $(netpbm_config xml xml2)
95 JBIGLIB = $(netpbm_config jbig)
96 JBIGHDR_DIR =
97 - JASPERLIB = $(netpbm_config jpeg2k jasper)
98 + JASPERLIB = NONE
99 JASPERHDR_DIR =
100 URTLIB = $(netpbm_config rle)
101 URTHDR_DIR =
102
103 diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
104 index af7d4100ce2..10dd2b062d5 100644
105 --- a/media-libs/netpbm/netpbm-10.76.00.ebuild
106 +++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
107 @@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
108 LICENSE="GPL-2"
109 SLOT="0"
110 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
111 -IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
112 +IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
113
114 RDEPEND="jbig? ( media-libs/jbigkit )
115 jpeg? ( virtual/jpeg:0 )
116 - jpeg2k? ( media-libs/jasper )
117 png? ( >=media-libs/libpng-1.4:0 )
118 postscript? ( app-text/ghostscript-gpl )
119 rle? ( media-libs/urt )
120 @@ -137,7 +136,7 @@ src_configure() {
121 XML2_LIBS = $(netpbm_config xml xml2)
122 JBIGLIB = $(netpbm_config jbig)
123 JBIGHDR_DIR =
124 - JASPERLIB = $(netpbm_config jpeg2k jasper)
125 + JASPERLIB = NONE
126 JASPERHDR_DIR =
127 URTLIB = $(netpbm_config rle)
128 URTHDR_DIR =
Report Message
Find on MARC Find on Google Groups