1 |
commit: 2352a5aa0333e293cbac617fb5a6833aaea30eac |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 14 22:56:19 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 14 23:20:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2352a5aa |
7 |
|
8 |
media-gfx/imagemagick: bump to v6.9.10-78 & 7.0.9-8 |
9 |
|
10 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
media-gfx/imagemagick/Manifest | 6 +- |
14 |
media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild | 249 -------------------- |
15 |
...9.10.74.ebuild => imagemagick-6.9.10.78.ebuild} | 6 +- |
16 |
media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild | 262 --------------------- |
17 |
...k-7.0.9.5.ebuild => imagemagick-7.0.9.8.ebuild} | 3 +- |
18 |
5 files changed, 8 insertions(+), 518 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest |
21 |
index 1a2f40bfaa0..cf6f8d76168 100644 |
22 |
--- a/media-gfx/imagemagick/Manifest |
23 |
+++ b/media-gfx/imagemagick/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST ImageMagick-6.9.10-74.tar.xz 9063472 BLAKE2B 11a57ab7f030dbea3d4875b079b131825180e25d4b7b796ae901b1f44edc66b2d6e3feb0271b3afcad67ae1f29fa70d993c8586b12612b53334754e0ccb2582f SHA512 eea3c0d95af431e1949faea95a15fd7a43db72eda8106a9af7994b9760a0f040301ba7e7cb365994fa31bbd3bb40d4624f4d3007366d2fee160eeb7242ed48f9 |
26 |
-DIST ImageMagick-6.9.10-77.tar.xz 9068384 BLAKE2B aafbb1debe10f6526a4cdf191381eb171cb9d887b20077313f40f2755e8bedc21c1c27fcd147a521d3c23a7ebf7494701ef20eefc1b1b7b2b861a870bff2bcf1 SHA512 4b6af2a0e28af33314c13f01b1a2b269cd04c5ba873fa8fda5a211dc942d28ad8f4a5e0f88b332e71d2d449d546df60886ebae15fe70e9162c5bf2881710f0d6 |
27 |
-DIST ImageMagick-7.0.9-5.tar.xz 9468724 BLAKE2B 951a02f119941b8f0ef323aa748947535575e49935e22ff0ace9f716eb5c1ee60a0989877161a7fd97b4d893445f30e3d046317eb83ef4ed8105e1baa02aac83 SHA512 dffb67deaf38e7d4d532eed629a3e4c11be76e6ee32abbca80cf2bdd26e9a916c218ea30f99aebbc9fdcab595cd954757d56e723c1b7d22de3e4fb11c8a7975d |
28 |
-DIST ImageMagick-7.0.9-7.tar.xz 9481272 BLAKE2B 15af7ec85a43ae16712d079652e052286703f4b89d34d95194258f0cde239d6f6393fe1d567d5dbad6b9cf4349688f7c77bc42d8d28f49b266c9315b433bee1f SHA512 f14cf492e6fec62511f93f1bdd1fc97912c7f3acc581782948e69cf5ccc42132a4f0d250345ac0a47d9954ee0bd3d286ab77cc0f28ca1db76c06ceb197639014 |
29 |
+DIST imagemagick-6.9.10.78.tar.gz 13522518 BLAKE2B 1eab0f7bc6bbecc44b3f25a752ae2b6ad8f026fe700c78d0b914aa23e5737485c8c41785859035002e1dbd16e7d19af823ea71425cb56f732fbee08419212d7d SHA512 8ab6c91afcf2b8c1bd0a4f130d35abae914599ddf7e0c85d6bf57ace8822cdf1cc57929e047350b06532546827856420a484fc9754ae403684db9df04d0f66a9 |
30 |
+DIST imagemagick-7.0.9.8.tar.gz 13678831 BLAKE2B 3e5189fa244577fdc7d9e674ef0b2385a67dbfc4a0c80fac66a7224b31805925c97fe1955b8386e6d622dd64ffed1cc888657ba5f885d66fb0e8df32703b4ce8 SHA512 3797978e6da49bd6129a437110d9b2b15e1963178c5c62fd228e68295645b469f5cf7d3bb0974ce74a320094973137adfb7409f47248383fe63abc4a49a90ddf |
31 |
|
32 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild |
33 |
deleted file mode 100644 |
34 |
index 9f32b46a982..00000000000 |
35 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,249 +0,0 @@ |
38 |
-# Copyright 1999-2019 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI="6" |
42 |
- |
43 |
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib |
44 |
- |
45 |
-MY_PV="$(ver_rs 3 '-')" |
46 |
-MY_P="ImageMagick-${MY_PV}" |
47 |
- |
48 |
-DESCRIPTION="A collection of tools and libraries for many image formats" |
49 |
-HOMEPAGE="https://www.imagemagick.org/" |
50 |
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
51 |
- |
52 |
-LICENSE="imagemagick" |
53 |
-SLOT="0/${PV}" |
54 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
55 |
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" |
56 |
- |
57 |
-REQUIRED_USE="corefonts? ( truetype ) |
58 |
- test? ( corefonts )" |
59 |
- |
60 |
-RESTRICT="perl? ( userpriv ) |
61 |
- !test? ( test )" |
62 |
- |
63 |
-RDEPEND=" |
64 |
- dev-libs/libltdl:0 |
65 |
- bzip2? ( app-arch/bzip2 ) |
66 |
- corefonts? ( media-fonts/corefonts ) |
67 |
- djvu? ( app-text/djvu ) |
68 |
- fftw? ( sci-libs/fftw:3.0 ) |
69 |
- fontconfig? ( media-libs/fontconfig ) |
70 |
- fpx? ( >=media-libs/libfpx-1.3.0-r1 ) |
71 |
- graphviz? ( media-gfx/graphviz ) |
72 |
- heif? ( media-libs/libheif:= ) |
73 |
- jbig? ( >=media-libs/jbigkit-2:= ) |
74 |
- jpeg? ( virtual/jpeg:0 ) |
75 |
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) |
76 |
- lcms? ( media-libs/lcms:2= ) |
77 |
- lqr? ( media-libs/liblqr ) |
78 |
- opencl? ( virtual/opencl ) |
79 |
- openexr? ( media-libs/openexr:0= ) |
80 |
- pango? ( x11-libs/pango ) |
81 |
- perl? ( >=dev-lang/perl-5.8.8:0= ) |
82 |
- png? ( media-libs/libpng:0= ) |
83 |
- postscript? ( app-text/ghostscript-gpl ) |
84 |
- raw? ( media-libs/libraw:= ) |
85 |
- svg? ( gnome-base/librsvg ) |
86 |
- tiff? ( media-libs/tiff:0= ) |
87 |
- truetype? ( |
88 |
- media-fonts/urw-fonts |
89 |
- >=media-libs/freetype-2 |
90 |
- ) |
91 |
- webp? ( media-libs/libwebp:0= ) |
92 |
- wmf? ( media-libs/libwmf ) |
93 |
- X? ( |
94 |
- x11-libs/libICE |
95 |
- x11-libs/libSM |
96 |
- x11-libs/libXext |
97 |
- x11-libs/libXt |
98 |
- ) |
99 |
- xml? ( dev-libs/libxml2:= ) |
100 |
- lzma? ( app-arch/xz-utils ) |
101 |
- zlib? ( sys-libs/zlib:= )" |
102 |
-DEPEND="${RDEPEND} |
103 |
- !media-gfx/graphicsmagick[imagemagick] |
104 |
- virtual/pkgconfig |
105 |
- X? ( x11-base/xorg-proto )" |
106 |
- |
107 |
-S="${WORKDIR}/${MY_P}" |
108 |
- |
109 |
-src_prepare() { |
110 |
- default |
111 |
- |
112 |
- # Apply hardening #664236 |
113 |
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die |
114 |
- sed -i -e '/^<policymap>$/ { |
115 |
- r policy-hardening.snippet |
116 |
- d |
117 |
- }' \ |
118 |
- config/policy.xml || \ |
119 |
- die "Failed to apply hardening of policy.xml" |
120 |
- einfo "policy.xml hardened" |
121 |
- |
122 |
- elibtoolize # for Darwin modules |
123 |
- |
124 |
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
125 |
- local mesa_cards ati_cards nvidia_cards render_cards |
126 |
- shopt -s nullglob |
127 |
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
128 |
- if test -n "${ati_cards}"; then |
129 |
- addpredict "${ati_cards}" |
130 |
- fi |
131 |
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
132 |
- if test -n "${mesa_cards}"; then |
133 |
- addpredict "${mesa_cards}" |
134 |
- fi |
135 |
- nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') |
136 |
- if test -n "${nvidia_cards}"; then |
137 |
- addpredict "${nvidia_cards}" |
138 |
- fi |
139 |
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') |
140 |
- if test -n "${render_cards}"; then |
141 |
- addpredict "${render_cards}" |
142 |
- fi |
143 |
- shopt -u nullglob |
144 |
- addpredict /dev/nvidiactl |
145 |
-} |
146 |
- |
147 |
-src_configure() { |
148 |
- local depth=16 |
149 |
- use q8 && depth=8 |
150 |
- use q32 && depth=32 |
151 |
- |
152 |
- local openmp=disable |
153 |
- use openmp && { tc-has-openmp && openmp=enable; } |
154 |
- |
155 |
- use perl && perl_check_env |
156 |
- |
157 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket |
158 |
- |
159 |
- local myeconfargs=( |
160 |
- $(use_enable static-libs static) |
161 |
- $(use_enable hdri) |
162 |
- $(use_enable opencl) |
163 |
- --with-threads |
164 |
- --with-modules |
165 |
- --with-quantum-depth=${depth} |
166 |
- $(use_with cxx magick-plus-plus) |
167 |
- $(use_with perl) |
168 |
- --with-perl-options='INSTALLDIRS=vendor' |
169 |
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts |
170 |
- $(use_with bzip2 bzlib) |
171 |
- $(use_with X x) |
172 |
- $(use_with zlib) |
173 |
- --without-autotrace |
174 |
- $(use_with postscript dps) |
175 |
- $(use_with djvu) |
176 |
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu |
177 |
- $(use_with fftw) |
178 |
- $(use_with fpx) |
179 |
- $(use_with fontconfig) |
180 |
- $(use_with truetype freetype) |
181 |
- $(use_with postscript gslib) |
182 |
- $(use_with graphviz gvc) |
183 |
- $(use_with heif heic) |
184 |
- $(use_with jbig) |
185 |
- $(use_with jpeg) |
186 |
- $(use_with jpeg2k openjp2) |
187 |
- $(use_with lcms) |
188 |
- $(use_with lqr) |
189 |
- $(use_with lzma) |
190 |
- $(use_with openexr) |
191 |
- $(use_with pango) |
192 |
- $(use_with png) |
193 |
- $(use_with raw) |
194 |
- $(use_with svg rsvg) |
195 |
- $(use_with tiff) |
196 |
- $(use_with webp) |
197 |
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) |
198 |
- $(use_with wmf) |
199 |
- $(use_with xml) |
200 |
- --${openmp}-openmp |
201 |
- --with-gcc-arch=no-automagic |
202 |
- ) |
203 |
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" |
204 |
-} |
205 |
- |
206 |
-src_test() { |
207 |
- # Install default (unrestricted) policy in $HOME for test suite #664238 |
208 |
- local _im_local_config_home="${HOME}/.config/ImageMagick" |
209 |
- mkdir -p "${_im_local_config_home}" || \ |
210 |
- die "Failed to create IM config dir in '${_im_local_config_home}'" |
211 |
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
212 |
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
213 |
- |
214 |
- local im_command= IM_COMMANDS=() |
215 |
- IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
216 |
- IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used |
217 |
- IM_COMMANDS+=( "emake check" ) # Run tests |
218 |
- |
219 |
- for im_command in "${IM_COMMANDS[@]}"; do |
220 |
- eval "${S}"/magick.sh \ |
221 |
- ${im_command} || \ |
222 |
- die "Failed to run \"${im_command}\"" |
223 |
- done |
224 |
-} |
225 |
- |
226 |
-src_install() { |
227 |
- # Ensure documentation installation files and paths with each release! |
228 |
- emake \ |
229 |
- DESTDIR="${D}" \ |
230 |
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ |
231 |
- install |
232 |
- |
233 |
- rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} |
234 |
- dodoc {AUTHORS,README}.txt ChangeLog |
235 |
- |
236 |
- if use perl; then |
237 |
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + |
238 |
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + |
239 |
- fi |
240 |
- |
241 |
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
242 |
- |
243 |
- if use opencl; then |
244 |
- cat <<-EOF > "${T}"/99${PN} |
245 |
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" |
246 |
- EOF |
247 |
- |
248 |
- insinto /etc/sandbox.d |
249 |
- doins "${T}"/99${PN} #472766 |
250 |
- fi |
251 |
- |
252 |
- insinto /usr/share/${PN} |
253 |
- doins config/*icm |
254 |
-} |
255 |
- |
256 |
-pkg_postinst() { |
257 |
- local _show_policy_xml_notice= |
258 |
- |
259 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
260 |
- # This is a new installation |
261 |
- _show_policy_xml_notice=yes |
262 |
- else |
263 |
- local v |
264 |
- for v in ${REPLACING_VERSIONS}; do |
265 |
- if ! ver_test "${v}" -gt "6.9.10.10-r2"; then |
266 |
- # This is an upgrade |
267 |
- _show_policy_xml_notice=yes |
268 |
- |
269 |
- # Show this elog only once |
270 |
- break |
271 |
- fi |
272 |
- done |
273 |
- fi |
274 |
- |
275 |
- if [[ -n "${_show_policy_xml_notice}" ]]; then |
276 |
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" |
277 |
- elog "which will prevent the usage of the following coders by default:" |
278 |
- elog "" |
279 |
- elog " - PS" |
280 |
- elog " - PS2" |
281 |
- elog " - PS3" |
282 |
- elog " - EPS" |
283 |
- elog " - PDF" |
284 |
- elog " - XPS" |
285 |
- fi |
286 |
-} |
287 |
|
288 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild |
289 |
similarity index 97% |
290 |
rename from media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild |
291 |
rename to media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild |
292 |
index 104ec59adc7..99cd54e5c91 100644 |
293 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild |
294 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild |
295 |
@@ -10,7 +10,8 @@ MY_P="ImageMagick-${MY_PV}" |
296 |
|
297 |
DESCRIPTION="A collection of tools and libraries for many image formats" |
298 |
HOMEPAGE="https://www.imagemagick.org/" |
299 |
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
300 |
+#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
301 |
+SRC_URI="https://github.com/ImageMagick/ImageMagick6/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
302 |
|
303 |
LICENSE="imagemagick" |
304 |
SLOT="0/${PV}" |
305 |
@@ -67,7 +68,8 @@ DEPEND="${RDEPEND} |
306 |
virtual/pkgconfig |
307 |
X? ( x11-base/xorg-proto )" |
308 |
|
309 |
-S="${WORKDIR}/${MY_P}" |
310 |
+#S="${WORKDIR}/${MY_P}" |
311 |
+S="${WORKDIR}/ImageMagick6-${MY_PV}" |
312 |
|
313 |
src_prepare() { |
314 |
default |
315 |
|
316 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild |
317 |
deleted file mode 100644 |
318 |
index 8d8ee8a769b..00000000000 |
319 |
--- a/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild |
320 |
+++ /dev/null |
321 |
@@ -1,262 +0,0 @@ |
322 |
-# Copyright 1999-2019 Gentoo Authors |
323 |
-# Distributed under the terms of the GNU General Public License v2 |
324 |
- |
325 |
-EAPI="7" |
326 |
- |
327 |
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib |
328 |
- |
329 |
-if [[ ${PV} == "9999" ]] ; then |
330 |
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" |
331 |
- inherit git-r3 |
332 |
- MY_P="imagemagick-9999" |
333 |
-else |
334 |
- MY_PV="$(ver_rs 3 '-')" |
335 |
- MY_P="ImageMagick-${MY_PV}" |
336 |
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
337 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
338 |
-fi |
339 |
- |
340 |
-DESCRIPTION="A collection of tools and libraries for many image formats" |
341 |
-HOMEPAGE="https://www.imagemagick.org/" |
342 |
- |
343 |
-LICENSE="imagemagick" |
344 |
-SLOT="0/7.0.9" |
345 |
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" |
346 |
-RESTRICT="!test? ( test )" |
347 |
- |
348 |
-REQUIRED_USE="corefonts? ( truetype ) |
349 |
- test? ( corefonts )" |
350 |
- |
351 |
-RESTRICT="!test? ( test )" |
352 |
- |
353 |
-BDEPEND="virtual/pkgconfig" |
354 |
- |
355 |
-RDEPEND=" |
356 |
- dev-libs/libltdl:0 |
357 |
- bzip2? ( app-arch/bzip2 ) |
358 |
- corefonts? ( media-fonts/corefonts ) |
359 |
- djvu? ( app-text/djvu ) |
360 |
- fftw? ( sci-libs/fftw:3.0 ) |
361 |
- fontconfig? ( media-libs/fontconfig ) |
362 |
- fpx? ( >=media-libs/libfpx-1.3.0-r1 ) |
363 |
- graphviz? ( media-gfx/graphviz ) |
364 |
- heif? ( media-libs/libheif:= ) |
365 |
- jbig? ( >=media-libs/jbigkit-2:= ) |
366 |
- jpeg? ( virtual/jpeg:0 ) |
367 |
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) |
368 |
- lcms? ( media-libs/lcms:2= ) |
369 |
- lqr? ( media-libs/liblqr ) |
370 |
- opencl? ( virtual/opencl ) |
371 |
- openexr? ( media-libs/openexr:0= ) |
372 |
- pango? ( x11-libs/pango ) |
373 |
- perl? ( >=dev-lang/perl-5.8.8:0= ) |
374 |
- png? ( media-libs/libpng:0= ) |
375 |
- postscript? ( app-text/ghostscript-gpl ) |
376 |
- raw? ( media-libs/libraw:= ) |
377 |
- svg? ( gnome-base/librsvg ) |
378 |
- tiff? ( media-libs/tiff:0= ) |
379 |
- truetype? ( |
380 |
- media-fonts/urw-fonts |
381 |
- >=media-libs/freetype-2 |
382 |
- ) |
383 |
- webp? ( media-libs/libwebp:0= ) |
384 |
- wmf? ( media-libs/libwmf ) |
385 |
- X? ( |
386 |
- x11-libs/libICE |
387 |
- x11-libs/libSM |
388 |
- x11-libs/libXext |
389 |
- x11-libs/libXt |
390 |
- ) |
391 |
- xml? ( dev-libs/libxml2:= ) |
392 |
- lzma? ( app-arch/xz-utils ) |
393 |
- zlib? ( sys-libs/zlib:= )" |
394 |
- |
395 |
-DEPEND="${RDEPEND} |
396 |
- !media-gfx/graphicsmagick[imagemagick] |
397 |
- X? ( x11-base/xorg-proto )" |
398 |
- |
399 |
-S="${WORKDIR}/${MY_P}" |
400 |
- |
401 |
-src_prepare() { |
402 |
- default |
403 |
- |
404 |
- # Apply hardening #664236 |
405 |
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die |
406 |
- sed -i -e '/^<policymap>$/ { |
407 |
- r policy-hardening.snippet |
408 |
- d |
409 |
- }' \ |
410 |
- config/policy.xml || \ |
411 |
- die "Failed to apply hardening of policy.xml" |
412 |
- einfo "policy.xml hardened" |
413 |
- |
414 |
- elibtoolize # for Darwin modules |
415 |
- |
416 |
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
417 |
- local ati_cards mesa_cards nvidia_cards render_cards |
418 |
- shopt -s nullglob |
419 |
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
420 |
- if test -n "${ati_cards}"; then |
421 |
- addpredict "${ati_cards}" |
422 |
- fi |
423 |
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
424 |
- if test -n "${mesa_cards}"; then |
425 |
- addpredict "${mesa_cards}" |
426 |
- fi |
427 |
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') |
428 |
- if test -n "${nvidia_cards}"; then |
429 |
- addpredict "${nvidia_cards}" |
430 |
- fi |
431 |
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') |
432 |
- if test -n "${render_cards}"; then |
433 |
- addpredict "${render_cards}" |
434 |
- fi |
435 |
- shopt -u nullglob |
436 |
- addpredict /dev/nvidiactl |
437 |
-} |
438 |
- |
439 |
-src_configure() { |
440 |
- local depth=16 |
441 |
- use q8 && depth=8 |
442 |
- use q32 && depth=32 |
443 |
- |
444 |
- local openmp=disable |
445 |
- use openmp && { tc-has-openmp && openmp=enable; } |
446 |
- |
447 |
- use perl && perl_check_env |
448 |
- |
449 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket |
450 |
- |
451 |
- local myeconfargs=( |
452 |
- $(use_enable static-libs static) |
453 |
- $(use_enable hdri) |
454 |
- $(use_enable opencl) |
455 |
- --with-threads |
456 |
- --with-modules |
457 |
- --with-quantum-depth=${depth} |
458 |
- $(use_with cxx magick-plus-plus) |
459 |
- $(use_with perl) |
460 |
- --with-perl-options='INSTALLDIRS=vendor' |
461 |
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts |
462 |
- $(use_with bzip2 bzlib) |
463 |
- $(use_with X x) |
464 |
- $(use_with zlib) |
465 |
- --without-autotrace |
466 |
- $(use_with postscript dps) |
467 |
- $(use_with djvu) |
468 |
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu |
469 |
- $(use_with fftw) |
470 |
- $(use_with fpx) |
471 |
- $(use_with fontconfig) |
472 |
- $(use_with truetype freetype) |
473 |
- $(use_with postscript gslib) |
474 |
- $(use_with graphviz gvc) |
475 |
- $(use_with heif heic) |
476 |
- $(use_with jbig) |
477 |
- $(use_with jpeg) |
478 |
- $(use_with jpeg2k openjp2) |
479 |
- --without-jxl |
480 |
- $(use_with lcms) |
481 |
- $(use_with lqr) |
482 |
- $(use_with lzma) |
483 |
- $(use_with openexr) |
484 |
- $(use_with pango) |
485 |
- $(use_with png) |
486 |
- $(use_with raw) |
487 |
- $(use_with svg rsvg) |
488 |
- $(use_with tiff) |
489 |
- $(use_with webp) |
490 |
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) |
491 |
- $(use_with wmf) |
492 |
- $(use_with xml) |
493 |
- --${openmp}-openmp |
494 |
- --with-gcc-arch=no-automagic |
495 |
- ) |
496 |
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" |
497 |
-} |
498 |
- |
499 |
-src_test() { |
500 |
- # Install default (unrestricted) policy in $HOME for test suite #664238 |
501 |
- local _im_local_config_home="${HOME}/.config/ImageMagick" |
502 |
- mkdir -p "${_im_local_config_home}" || \ |
503 |
- die "Failed to create IM config dir in '${_im_local_config_home}'" |
504 |
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
505 |
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
506 |
- |
507 |
- local im_command= IM_COMMANDS=() |
508 |
- if [[ ${PV} == "9999" ]] ; then |
509 |
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild |
510 |
- else |
511 |
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
512 |
- fi |
513 |
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
514 |
- IM_COMMANDS+=( "emake check" ) # Run tests |
515 |
- |
516 |
- for im_command in "${IM_COMMANDS[@]}"; do |
517 |
- eval "${S}"/magick.sh \ |
518 |
- ${im_command} || \ |
519 |
- die "Failed to run \"${im_command}\"" |
520 |
- done |
521 |
-} |
522 |
- |
523 |
-src_install() { |
524 |
- # Ensure documentation installation files and paths with each release! |
525 |
- emake \ |
526 |
- DESTDIR="${D}" \ |
527 |
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ |
528 |
- install |
529 |
- |
530 |
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} |
531 |
- dodoc {AUTHORS,README}.txt ChangeLog |
532 |
- |
533 |
- if use perl; then |
534 |
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + |
535 |
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + |
536 |
- fi |
537 |
- |
538 |
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
539 |
- |
540 |
- if use opencl; then |
541 |
- cat <<-EOF > "${T}"/99${PN} |
542 |
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" |
543 |
- EOF |
544 |
- |
545 |
- insinto /etc/sandbox.d |
546 |
- doins "${T}"/99${PN} #472766 |
547 |
- fi |
548 |
- |
549 |
- insinto /usr/share/${PN} |
550 |
- doins config/*icm |
551 |
-} |
552 |
- |
553 |
-pkg_postinst() { |
554 |
- local _show_policy_xml_notice= |
555 |
- |
556 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
557 |
- # This is a new installation |
558 |
- _show_policy_xml_notice=yes |
559 |
- else |
560 |
- local v |
561 |
- for v in ${REPLACING_VERSIONS}; do |
562 |
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then |
563 |
- # This is an upgrade |
564 |
- _show_policy_xml_notice=yes |
565 |
- |
566 |
- # Show this elog only once |
567 |
- break |
568 |
- fi |
569 |
- done |
570 |
- fi |
571 |
- |
572 |
- if [[ -n "${_show_policy_xml_notice}" ]]; then |
573 |
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" |
574 |
- elog "which will prevent the usage of the following coders by default:" |
575 |
- elog "" |
576 |
- elog " - PS" |
577 |
- elog " - PS2" |
578 |
- elog " - PS3" |
579 |
- elog " - EPS" |
580 |
- elog " - PDF" |
581 |
- elog " - XPS" |
582 |
- fi |
583 |
-} |
584 |
|
585 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild |
586 |
similarity index 98% |
587 |
rename from media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild |
588 |
rename to media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild |
589 |
index 8287ed2ffd5..568a44c6e22 100644 |
590 |
--- a/media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild |
591 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild |
592 |
@@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]] ; then |
593 |
else |
594 |
MY_PV="$(ver_rs 3 '-')" |
595 |
MY_P="ImageMagick-${MY_PV}" |
596 |
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
597 |
+ #SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
598 |
+ SRC_URI="https://github.com/ImageMagick/ImageMagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
599 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
600 |
fi |