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: Mon, 10 Dec 2018 23:13:01
Message-Id: 1544483569.45df66b3d63c6daac76c5832c23c5058ad8ae8d2.whissi@gentoo
1 commit: 45df66b3d63c6daac76c5832c23c5058ad8ae8d2
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 10 23:12:14 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 10 23:12:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45df66b3
7
8 media-gfx/imagemagick: bump to v6.9.10-16
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 media-gfx/imagemagick/Manifest | 1 +
14 media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild | 246 +++++++++++++++++++++
15 2 files changed, 247 insertions(+)
16
17 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
18 index b28c5474f4f..b960dcb120e 100644
19 --- a/media-gfx/imagemagick/Manifest
20 +++ b/media-gfx/imagemagick/Manifest
21 @@ -1,3 +1,4 @@
22 DIST ImageMagick-6.9.10-14.tar.xz 8931552 BLAKE2B e064648947f661c41fe86dea6484c0b9e01e54fcd3428b8d6dd39b2b7f93735200af9e4b49f0bdc92b574afbaa53ed044aab2b4b751e087ba126e58cdda1f497 SHA512 1a2c9fb717b0441a18c638991cf5365c42d00c19c0f67bc7cce4bd2cba42bac602e4dba8bd4abc1dbc6609a08b1292403acc3657b61c58ed0609e2bf740d0725
23 +DIST ImageMagick-6.9.10-16.tar.xz 8929036 BLAKE2B 1eb3150c5725d96bb2a9f9f7c07b5037e3da7e8f3871a9ae448352a967e5d8f5ccffdb7c27b608e4d6d9c8c13f7e8a219760292b6b191d37378c17ff182a2d09 SHA512 0adc57158260797df6db68256e87848135b52eba91dc65978e255061e3b22bfe7b3fbee3626ee8fb0183d37649143f0a46cbcbd6e090604cc4bb8e0752255fbd
24 DIST ImageMagick-7.0.8-14.tar.xz 8634400 BLAKE2B 1d5ad294ce29f275790c3b6ba76445ffb4aeaa2ff94d91af4d52a00b407dca0e5a4f589ec1a860bf6695952f8e7943d507baee58b885dc5fca3510de1d84c8eb SHA512 0a5f3357f4ce5b245d60b178d81b58c3483effb45b669791d4686514a8c3b0ad04244e31caf0a4a614e73e3e071c17d851992670917ebcf2761c977d77c58dd6
25 DIST ImageMagick-7.0.8-16.tar.xz 8646148 BLAKE2B 5a9c287164f99886c411cbb1416aaa72bdf527ba3be097a0ea6638cc6b0ae383057acab09974c7d3954a2985ec39e0ce4f6d6a2423ff4bb020d011bd1988c337 SHA512 fbc0b0410702c15352989652c055e4e1a099878e30b859c75322e162eccd384cabb98e14cac14e3fb2c902f25f80a5b62f94380ef78f891731980de9a40b6867
26
27 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild
28 new file mode 100644
29 index 00000000000..59b9a343932
30 --- /dev/null
31 +++ b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild
32 @@ -0,0 +1,246 @@
33 +# Copyright 1999-2018 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="6"
37 +
38 +inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
39 +
40 +MY_P=ImageMagick-$(ver_rs 3 '-')
41 +
42 +DESCRIPTION="A collection of tools and libraries for many image formats"
43 +HOMEPAGE="https://www.imagemagick.org/"
44 +SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
45 +
46 +LICENSE="imagemagick"
47 +SLOT="0/${PV}"
48 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
49 +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"
50 +
51 +RESTRICT="perl? ( userpriv )"
52 +
53 +RDEPEND="
54 + dev-libs/libltdl:0
55 + bzip2? ( app-arch/bzip2 )
56 + corefonts? ( media-fonts/corefonts )
57 + djvu? ( app-text/djvu )
58 + fftw? ( sci-libs/fftw:3.0 )
59 + fontconfig? ( media-libs/fontconfig )
60 + fpx? ( >=media-libs/libfpx-1.3.0-r1 )
61 + graphviz? ( media-gfx/graphviz )
62 + heif? ( media-libs/libheif:= )
63 + jbig? ( >=media-libs/jbigkit-2:= )
64 + jpeg? ( virtual/jpeg:0 )
65 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
66 + lcms? ( media-libs/lcms:2= )
67 + lqr? ( media-libs/liblqr )
68 + opencl? ( virtual/opencl )
69 + openexr? ( media-libs/openexr:0= )
70 + pango? ( x11-libs/pango )
71 + perl? ( >=dev-lang/perl-5.8.8:0= )
72 + png? ( media-libs/libpng:0= )
73 + postscript? ( app-text/ghostscript-gpl )
74 + raw? ( media-libs/libraw:= )
75 + svg? ( gnome-base/librsvg )
76 + tiff? ( media-libs/tiff:0= )
77 + truetype? (
78 + media-fonts/urw-fonts
79 + >=media-libs/freetype-2
80 + )
81 + webp? ( media-libs/libwebp:0= )
82 + wmf? ( media-libs/libwmf )
83 + X? (
84 + x11-libs/libICE
85 + x11-libs/libSM
86 + x11-libs/libXext
87 + x11-libs/libXt
88 + )
89 + xml? ( dev-libs/libxml2:= )
90 + lzma? ( app-arch/xz-utils )
91 + zlib? ( sys-libs/zlib:= )"
92 +DEPEND="${RDEPEND}
93 + !media-gfx/graphicsmagick[imagemagick]
94 + virtual/pkgconfig
95 + X? ( x11-base/xorg-proto )"
96 +
97 +REQUIRED_USE="corefonts? ( truetype )
98 + test? ( corefonts )"
99 +
100 +S="${WORKDIR}/${MY_P}"
101 +
102 +src_prepare() {
103 + default
104 +
105 + # Apply hardening #664236
106 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
107 + sed -i -e '/^<policymap>$/ {
108 + r policy-hardening.snippet
109 + d
110 + }' \
111 + config/policy.xml || \
112 + die "Failed to apply hardening of policy.xml"
113 + einfo "policy.xml hardened"
114 +
115 + elibtoolize # for Darwin modules
116 +
117 + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
118 + local mesa_cards ati_cards nvidia_cards render_cards
119 + shopt -s nullglob
120 + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
121 + if test -n "${ati_cards}"; then
122 + addpredict "${ati_cards}"
123 + fi
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 + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
129 + if test -n "${nvidia_cards}"; then
130 + addpredict "${nvidia_cards}"
131 + fi
132 + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
133 + if test -n "${render_cards}"; then
134 + addpredict "${render_cards}"
135 + fi
136 + shopt -u nullglob
137 + addpredict /dev/nvidiactl
138 +}
139 +
140 +src_configure() {
141 + local depth=16
142 + use q8 && depth=8
143 + use q32 && depth=32
144 +
145 + local openmp=disable
146 + use openmp && { tc-has-openmp && openmp=enable; }
147 +
148 + use perl && perl_check_env
149 +
150 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
151 +
152 + local myeconfargs=(
153 + $(use_enable static-libs static)
154 + $(use_enable hdri)
155 + $(use_enable opencl)
156 + --with-threads
157 + --with-modules
158 + --with-quantum-depth=${depth}
159 + $(use_with cxx magick-plus-plus)
160 + $(use_with perl)
161 + --with-perl-options='INSTALLDIRS=vendor'
162 + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
163 + $(use_with bzip2 bzlib)
164 + $(use_with X x)
165 + $(use_with zlib)
166 + --without-autotrace
167 + $(use_with postscript dps)
168 + $(use_with djvu)
169 + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
170 + $(use_with fftw)
171 + $(use_with fpx)
172 + $(use_with fontconfig)
173 + $(use_with truetype freetype)
174 + $(use_with postscript gslib)
175 + $(use_with graphviz gvc)
176 + $(use_with heif heic)
177 + $(use_with jbig)
178 + $(use_with jpeg)
179 + $(use_with jpeg2k openjp2)
180 + $(use_with lcms)
181 + $(use_with lqr)
182 + $(use_with lzma)
183 + $(use_with openexr)
184 + $(use_with pango)
185 + $(use_with png)
186 + $(use_with raw)
187 + $(use_with svg rsvg)
188 + $(use_with tiff)
189 + $(use_with webp)
190 + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
191 + $(use_with wmf)
192 + $(use_with xml)
193 + --${openmp}-openmp
194 + --with-gcc-arch=no-automagic
195 + )
196 + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
197 +}
198 +
199 +src_test() {
200 + # Install default (unrestricted) policy in $HOME for test suite #664238
201 + local _im_local_config_home="${HOME}/.config/ImageMagick"
202 + mkdir -p "${_im_local_config_home}" || \
203 + die "Failed to create IM config dir in '${_im_local_config_home}'"
204 + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
205 + die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
206 +
207 + local im_command= IM_COMMANDS=()
208 + IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built
209 + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
210 + IM_COMMANDS+=( "emake check" ) # Run tests
211 +
212 + for im_command in "${IM_COMMANDS[@]}"; do
213 + "${S}"/magick.sh \
214 + ${im_command} || die
215 + done
216 +}
217 +
218 +src_install() {
219 + # Ensure documentation installation files and paths with each release!
220 + emake \
221 + DESTDIR="${D}" \
222 + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
223 + install
224 +
225 + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
226 + dodoc {AUTHORS,README}.txt ChangeLog
227 +
228 + if use perl; then
229 + find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
230 + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
231 + fi
232 +
233 + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
234 +
235 + if use opencl; then
236 + cat <<-EOF > "${T}"/99${PN}
237 + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
238 + EOF
239 +
240 + insinto /etc/sandbox.d
241 + doins "${T}"/99${PN} #472766
242 + fi
243 +
244 + insinto /usr/share/${PN}
245 + doins config/*icm
246 +}
247 +
248 +pkg_postinst() {
249 + local _show_policy_xml_notice=
250 +
251 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
252 + # This is a new installation
253 + _show_policy_xml_notice=yes
254 + else
255 + local v
256 + for v in ${REPLACING_VERSIONS}; do
257 + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
258 + # This is an upgrade
259 + _show_policy_xml_notice=yes
260 +
261 + # Show this elog only once
262 + break
263 + fi
264 + done
265 + fi
266 +
267 + if [[ -n "${_show_policy_xml_notice}" ]]; then
268 + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
269 + elog "which will prevent the usage of the following coders by default:"
270 + elog ""
271 + elog " - PS"
272 + elog " - PS2"
273 + elog " - PS3"
274 + elog " - EPS"
275 + elog " - PDF"
276 + elog " - XPS"
277 + fi
278 +}