Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.9.9.ebuild ChangeLog
Date: Tue, 28 Oct 2014 05:05:55
Message-Id: 20141028050549.D28F78E7C@oystercatcher.gentoo.org
1 ssuominen 14/10/28 05:05:49
2
3 Modified: ChangeLog
4 Added: imagemagick-6.8.9.9.ebuild
5 Log:
6 Version bump wrt security bug #527028 by Hanno Boeck
7
8 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.565 media-gfx/imagemagick/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.565&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.565&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.564&r2=1.565
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
20 retrieving revision 1.564
21 retrieving revision 1.565
22 diff -u -r1.564 -r1.565
23 --- ChangeLog 4 Oct 2014 11:29:20 -0000 1.564
24 +++ ChangeLog 28 Oct 2014 05:05:49 -0000 1.565
25 @@ -1,6 +1,12 @@
26 # ChangeLog for media-gfx/imagemagick
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.564 2014/10/04 11:29:20 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.565 2014/10/28 05:05:49 ssuominen Exp $
30 +
31 +*imagemagick-6.8.9.9 (28 Oct 2014)
32 +
33 + 28 Oct 2014; Samuli Suominen <ssuominen@g.o>
34 + +imagemagick-6.8.9.9.ebuild:
35 + Version bump wrt security bug #527028 by Hanno Boeck
36
37 *imagemagick-6.8.9.8 (04 Oct 2014)
38
39
40
41
42 1.1 media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild?rev=1.1&content-type=text/plain
46
47 Index: imagemagick-6.8.9.9.ebuild
48 ===================================================================
49 # Copyright 1999-2014 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.1 2014/10/28 05:05:49 ssuominen Exp $
52
53 EAPI=5
54 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
55
56 MY_P=ImageMagick-$(replace_version_separator 3 '-')
57
58 DESCRIPTION="A collection of tools and libraries for many image formats"
59 HOMEPAGE="http://www.imagemagick.org/"
60 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
61
62 LICENSE="imagemagick"
63 SLOT="0/${PV}"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
65 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
66
67 RESTRICT="perl? ( userpriv )"
68
69 RDEPEND=">=sys-devel/libtool-2.2.6b
70 autotrace? ( >=media-gfx/autotrace-0.31.1 )
71 bzip2? ( app-arch/bzip2 )
72 corefonts? ( media-fonts/corefonts )
73 djvu? ( app-text/djvu )
74 fftw? ( sci-libs/fftw:3.0 )
75 fontconfig? ( media-libs/fontconfig )
76 fpx? ( >=media-libs/libfpx-1.3.0-r1 )
77 graphviz? ( media-gfx/graphviz )
78 jbig? ( >=media-libs/jbigkit-2:= )
79 jpeg? ( virtual/jpeg:0 )
80 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
81 lcms? ( media-libs/lcms:2= )
82 lqr? ( media-libs/liblqr )
83 opencl? ( virtual/opencl )
84 openexr? ( media-libs/openexr:0= )
85 pango? ( x11-libs/pango )
86 perl? ( >=dev-lang/perl-5.8.8:0= )
87 png? ( media-libs/libpng:0= )
88 postscript? ( app-text/ghostscript-gpl )
89 raw? ( media-gfx/ufraw )
90 svg? ( gnome-base/librsvg )
91 tiff? ( media-libs/tiff:0= )
92 truetype? (
93 media-fonts/urw-fonts
94 >=media-libs/freetype-2
95 )
96 webp? ( media-libs/libwebp:0= )
97 wmf? ( media-libs/libwmf )
98 X? (
99 x11-libs/libICE
100 x11-libs/libSM
101 x11-libs/libXext
102 x11-libs/libXt
103 )
104 xml? ( dev-libs/libxml2:= )
105 lzma? ( app-arch/xz-utils )
106 zlib? ( sys-libs/zlib:= )"
107 DEPEND="${RDEPEND}
108 !media-gfx/graphicsmagick[imagemagick]
109 virtual/pkgconfig
110 X? ( x11-proto/xextproto )"
111
112 REQUIRED_USE="corefonts? ( truetype )
113 test? ( corefonts )"
114
115 S=${WORKDIR}/${MY_P}
116
117 src_prepare() {
118 epatch_user
119
120 elibtoolize # for Darwin modules
121
122 # For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
123 shopt -s nullglob
124 mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
125 if test -n "${mesa_cards}"; then
126 addpredict "${mesa_cards}"
127 fi
128 ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
129 if test -n "${ati_cards}"; then
130 addpredict "${ati_cards}"
131 fi
132 shopt -u nullglob
133 addpredict /dev/nvidiactl
134 }
135
136 src_configure() {
137 local depth=16
138 use q8 && depth=8
139 use q32 && depth=32
140 use q64 && depth=64
141
142 local openmp=disable
143 use openmp && { tc-has-openmp && openmp=enable; }
144
145 [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
146
147 CONFIG_SHELL=$(type -P bash) \
148 econf \
149 $(use_enable static-libs static) \
150 $(use_enable hdri) \
151 $(use_enable opencl) \
152 --with-threads \
153 --with-modules \
154 --with-quantum-depth=${depth} \
155 $(use_with cxx magick-plus-plus) \
156 $(use_with perl) \
157 --with-perl-options='INSTALLDIRS=vendor' \
158 --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
159 $(use_with bzip2 bzlib) \
160 $(use_with X x) \
161 $(use_with zlib) \
162 $(use_with autotrace) \
163 $(use_with postscript dps) \
164 $(use_with djvu) \
165 --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
166 $(use_with fftw) \
167 $(use_with fpx) \
168 $(use_with fontconfig) \
169 $(use_with truetype freetype) \
170 $(use_with postscript gslib) \
171 $(use_with graphviz gvc) \
172 $(use_with jbig) \
173 $(use_with jpeg) \
174 $(use_with jpeg2k openjp2) \
175 --without-lcms \
176 $(use_with lcms lcms2) \
177 $(use_with lqr) \
178 $(use_with lzma) \
179 $(use_with openexr) \
180 $(use_with pango) \
181 $(use_with png) \
182 $(use_with svg rsvg) \
183 $(use_with tiff) \
184 $(use_with webp) \
185 $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
186 $(use_with wmf) \
187 $(use_with xml) \
188 --${openmp}-openmp
189 }
190
191 src_test() {
192 LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
193 emake -j1 check
194 }
195
196 src_install() {
197 # Ensure documentation installation files and paths with each release!
198 emake \
199 DESTDIR="${D}" \
200 DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
201 install
202
203 rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
204 dodoc {AUTHORS,README}.txt ChangeLog
205
206 if use perl; then
207 find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
208 find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
209 fi
210
211 find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
212
213 if use opencl; then
214 cat <<-EOF > "${T}"/99${PN}
215 SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card"
216 EOF
217
218 insinto /etc/sandbox.d
219 doins "${T}"/99${PN} #472766
220 fi
221 }