Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
Date: Sun, 17 Nov 2019 22:22:21
Message-Id: 1574029332.ef589fb576812e360f48f303a3d4d710457f6393.whissi@gentoo
1 commit: ef589fb576812e360f48f303a3d4d710457f6393
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 17 22:16:32 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 17 22:22:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef589fb5
7
8 media-gfx/imagemagick: bump to v7.0.9-4
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.18
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 media-gfx/imagemagick/Manifest | 3 +-
14 media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild | 257 ---------------------
15 ...k-7.0.9.2.ebuild => imagemagick-7.0.9.4.ebuild} | 2 +-
16 3 files changed, 2 insertions(+), 260 deletions(-)
17
18 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
19 index af81d696c9e..a40cb67db1a 100644
20 --- a/media-gfx/imagemagick/Manifest
21 +++ b/media-gfx/imagemagick/Manifest
22 @@ -1,3 +1,2 @@
23 DIST ImageMagick-6.9.10-73.tar.xz 9065360 BLAKE2B 7d29c08d9bb0b93b5ea214307203530cb8822cc7f8bc7fb39016b6eac2fc2ad6be40e3a71af7fe09d6bb0b05d669701b05949a7f20df2dcc014fbf8983c8dc36 SHA512 b05d8b4334f054c1b0ee9ef106d70c7bcbe3671ccd097320f648084d9b5ef9c4fc0b9d68267a62e69b64313e64a97343630feadf20e672e64ab2deac518b84b7
24 -DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
25 -DIST ImageMagick-7.0.9-2.tar.xz 9475956 BLAKE2B e2912f497b148c406d13223e349a95dccb40f377e49e58119933113324c6424c1627d918d6d2f6400e3470bdfb24c546851a072f389d9e8fec19de5d1a8176a0 SHA512 d584e467bc9e7ff90b1a4f715c792ffd272574da2efefb0cc39fbaa2ad225eed2fc12936785dea44755158a23c3a8397754feba07e442249e535a7b12388ae90
26 +DIST ImageMagick-7.0.9-4.tar.xz 9479288 BLAKE2B 2638f193fb14f3f10f2b3927275777916f5234cd6aa515cae778471169ad74fab447b5dc620b5b630282cd00e4218922baf5fca066778d517c92de41216bcf9f SHA512 75c34a9aad62f7a102873e2b3fcda7c032bc40bfa0c0d5b524001f4c45a93943072009b717e2a90ca1637bc7df3806408a3a3c2c1356de835e3a8bbce20cddb0
27
28 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
29 deleted file mode 100644
30 index 37288b3d2df..00000000000
31 --- a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
32 +++ /dev/null
33 @@ -1,257 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="6"
38 -
39 -inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
40 -
41 -if [[ ${PV} == "9999" ]] ; then
42 - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
43 - inherit git-r3
44 - MY_P="imagemagick-9999"
45 -else
46 - MY_PV="$(ver_rs 3 '-')"
47 - MY_P="ImageMagick-${MY_PV}"
48 - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
49 - 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"
50 -fi
51 -
52 -DESCRIPTION="A collection of tools and libraries for many image formats"
53 -HOMEPAGE="https://www.imagemagick.org/"
54 -
55 -LICENSE="imagemagick"
56 -SLOT="0/${PV}"
57 -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"
58 -RESTRICT="!test? ( test )"
59 -
60 -RDEPEND="
61 - dev-libs/libltdl:0
62 - bzip2? ( app-arch/bzip2 )
63 - corefonts? ( media-fonts/corefonts )
64 - djvu? ( app-text/djvu )
65 - fftw? ( sci-libs/fftw:3.0 )
66 - fontconfig? ( media-libs/fontconfig )
67 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
68 - graphviz? ( media-gfx/graphviz )
69 - heif? ( media-libs/libheif:= )
70 - jbig? ( >=media-libs/jbigkit-2:= )
71 - jpeg? ( virtual/jpeg:0 )
72 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
73 - lcms? ( media-libs/lcms:2= )
74 - lqr? ( media-libs/liblqr )
75 - opencl? ( virtual/opencl )
76 - openexr? ( media-libs/openexr:0= )
77 - pango? ( x11-libs/pango )
78 - perl? ( >=dev-lang/perl-5.8.8:0= )
79 - png? ( media-libs/libpng:0= )
80 - postscript? ( app-text/ghostscript-gpl )
81 - raw? ( media-libs/libraw:= )
82 - svg? ( gnome-base/librsvg )
83 - tiff? ( media-libs/tiff:0= )
84 - truetype? (
85 - media-fonts/urw-fonts
86 - >=media-libs/freetype-2
87 - )
88 - webp? ( media-libs/libwebp:0= )
89 - wmf? ( media-libs/libwmf )
90 - X? (
91 - x11-libs/libICE
92 - x11-libs/libSM
93 - x11-libs/libXext
94 - x11-libs/libXt
95 - )
96 - xml? ( dev-libs/libxml2:= )
97 - lzma? ( app-arch/xz-utils )
98 - zlib? ( sys-libs/zlib:= )"
99 -DEPEND="${RDEPEND}
100 - !media-gfx/graphicsmagick[imagemagick]
101 - virtual/pkgconfig
102 - X? ( x11-base/xorg-proto )"
103 -
104 -REQUIRED_USE="corefonts? ( truetype )
105 - test? ( corefonts )"
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 ati_cards mesa_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 - if [[ ${PV} == "9999" ]] ; then
216 - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
217 - else
218 - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
219 - fi
220 - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
221 - IM_COMMANDS+=( "emake check" ) # Run tests
222 -
223 - for im_command in "${IM_COMMANDS[@]}"; do
224 - eval "${S}"/magick.sh \
225 - ${im_command} || \
226 - die "Failed to run \"${im_command}\""
227 - done
228 -}
229 -
230 -src_install() {
231 - # Ensure documentation installation files and paths with each release!
232 - emake \
233 - DESTDIR="${D}" \
234 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
235 - install
236 -
237 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
238 - dodoc {AUTHORS,README}.txt ChangeLog
239 -
240 - if use perl; then
241 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
242 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
243 - fi
244 -
245 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
246 -
247 - if use opencl; then
248 - cat <<-EOF > "${T}"/99${PN}
249 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
250 - EOF
251 -
252 - insinto /etc/sandbox.d
253 - doins "${T}"/99${PN} #472766
254 - fi
255 -
256 - insinto /usr/share/${PN}
257 - doins config/*icm
258 -}
259 -
260 -pkg_postinst() {
261 - local _show_policy_xml_notice=
262 -
263 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
264 - # This is a new installation
265 - _show_policy_xml_notice=yes
266 - else
267 - local v
268 - for v in ${REPLACING_VERSIONS}; do
269 - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
270 - # This is an upgrade
271 - _show_policy_xml_notice=yes
272 -
273 - # Show this elog only once
274 - break
275 - fi
276 - done
277 - fi
278 -
279 - if [[ -n "${_show_policy_xml_notice}" ]]; then
280 - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
281 - elog "which will prevent the usage of the following coders by default:"
282 - elog ""
283 - elog " - PS"
284 - elog " - PS2"
285 - elog " - PS3"
286 - elog " - EPS"
287 - elog " - PDF"
288 - elog " - XPS"
289 - fi
290 -}
291
292 diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
293 similarity index 97%
294 rename from media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
295 rename to media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
296 index 8d8ee8a769b..8287ed2ffd5 100644
297 --- a/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
298 +++ b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
299 @@ -13,7 +13,7 @@ else
300 MY_PV="$(ver_rs 3 '-')"
301 MY_P="ImageMagick-${MY_PV}"
302 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
303 - 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"
304 + 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"
305 fi
306
307 DESCRIPTION="A collection of tools and libraries for many image formats"