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