Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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, 30 Sep 2018 20:45:22
Message-Id: 1538340270.80c6836737de4d7e52889e44a80ffcfd7e0b7f01.whissi@gentoo
1 commit: 80c6836737de4d7e52889e44a80ffcfd7e0b7f01
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 20:32:46 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 20:44:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c68367
7
8 media-gfx/imagemagick: bump to v6.9.10-12 & 7.0.8-12
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11 Package-Manager: Portage-2.3.50, Repoman-2.3.11
12
13 media-gfx/imagemagick/Manifest | 2 ++
14 media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild | 4 +--
15 ...9.10.11.ebuild => imagemagick-6.9.10.12.ebuild} | 4 +--
16 ....9.10.11.ebuild => imagemagick-7.0.8.12.ebuild} | 32 ++++++++++++++--------
17 4 files changed, 26 insertions(+), 16 deletions(-)
18
19 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
20 index da08b453cb7..9de8834b988 100644
21 --- a/media-gfx/imagemagick/Manifest
22 +++ b/media-gfx/imagemagick/Manifest
23 @@ -1,2 +1,4 @@
24 DIST ImageMagick-6.9.10-11.tar.xz 8918436 BLAKE2B f7846b21a68d0e8e462cc7a86322f73ec0df7cfd10fb35e97f6adb375c9291b9571c07da901636bbc933330ec0f4c2ee27b3af673c6af28d30090e78a81b2bbc SHA512 b272eee7c74c3d2e6cdc7b5ba088bf87d7fad87c8828c9d2660986acb05c0ee06566c4b2b82913be9086a51e9b7c64ceb9ecc2bf28691d183b8e478a15384ead
25 +DIST ImageMagick-6.9.10-12.tar.xz 8928804 BLAKE2B 061a1a855040fb861b200f3b1968c6f976048a09ae94e8881d81cb9b8618404b6c69aab62718285482a7f15826a946af6365af8e731a50bc2812f45396f6241c SHA512 f9f663c399afa3b86c9302607155ca62dd7d519573f61735916147be23ca27dd8bb29dffbdcb542f3433f367cb1cc97af879d18d72dda0d9a18d4c82f1b0f134
26 DIST ImageMagick-7.0.8-11.tar.xz 8638236 BLAKE2B 927b9d467635f80d65b53e4d4d5c55e2ca4f8073b110881950d6bd9205a6da3b6ead91c624d1cccabb6c37f5bb841f9584c7c6d65714736898d17a22d9075a50 SHA512 b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18
27 +DIST ImageMagick-7.0.8-12.tar.xz 8630340 BLAKE2B f2a568ed5c4cb1143a05d0d917969d9e60c1a967369523a0defcc2782e635f867dd49234bc445ceceae5bbabf826eb923e789ae0b4c7e6a6345cea6758a083b0 SHA512 b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31
28
29 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
30 index 7c00fe4af0d..73431db9bc1 100644
31 --- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
32 +++ b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
33 @@ -1,4 +1,4 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 +# Copyright 1999-2018 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 EAPI="6"
39 @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
40
41 LICENSE="imagemagick"
42 SLOT="0/${PV}"
43 -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"
44 +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"
45 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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"
46
47 RESTRICT="perl? ( userpriv )"
48
49 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
50 similarity index 96%
51 copy from media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
52 copy to media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
53 index 7c00fe4af0d..73431db9bc1 100644
54 --- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
55 +++ b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
56 @@ -1,4 +1,4 @@
57 -# Copyright 1999-2018 Gentoo Foundation
58 +# Copyright 1999-2018 Gentoo Authors
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI="6"
62 @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
63
64 LICENSE="imagemagick"
65 SLOT="0/${PV}"
66 -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"
67 +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"
68 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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"
69
70 RESTRICT="perl? ( userpriv )"
71
72 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
73 similarity index 85%
74 copy from media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
75 copy to media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
76 index 7c00fe4af0d..428e6d1e211 100644
77 --- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
78 +++ b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
79 @@ -1,22 +1,26 @@
80 -# Copyright 1999-2018 Gentoo Foundation
81 +# Copyright 1999-2018 Gentoo Authors
82 # Distributed under the terms of the GNU General Public License v2
83
84 EAPI="6"
85
86 -inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
87 +inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
88
89 -MY_P=ImageMagick-$(ver_rs 3 '-')
90 +if [[ ${PV} == "9999" ]] ; then
91 + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
92 + inherit git-r3
93 + MY_P="imagemagick-9999"
94 +else
95 + MY_P=ImageMagick-$(ver_rs 3 '-')
96 + SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
97 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
98 +fi
99
100 DESCRIPTION="A collection of tools and libraries for many image formats"
101 HOMEPAGE="https://www.imagemagick.org/"
102 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
103
104 LICENSE="imagemagick"
105 SLOT="0/${PV}"
106 -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"
107 -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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"
108 -
109 -RESTRICT="perl? ( userpriv )"
110 +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"
111
112 RDEPEND="
113 dev-libs/libltdl:0
114 @@ -27,6 +31,7 @@ RDEPEND="
115 fontconfig? ( media-libs/fontconfig )
116 fpx? ( >=media-libs/libfpx-1.3.0-r1 )
117 graphviz? ( media-gfx/graphviz )
118 + heif? ( media-libs/libheif:= )
119 jbig? ( >=media-libs/jbigkit-2:= )
120 jpeg? ( virtual/jpeg:0 )
121 jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
122 @@ -89,7 +94,7 @@ src_prepare() {
123 elibtoolize # for Darwin modules
124
125 # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
126 - local mesa_cards ati_cards nvidia_cards render_cards
127 + local ati_cards mesa_cards nvidia_cards render_cards
128 shopt -s nullglob
129 ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
130 if test -n "${ati_cards}"; then
131 @@ -99,7 +104,7 @@ src_prepare() {
132 if test -n "${mesa_cards}"; then
133 addpredict "${mesa_cards}"
134 fi
135 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
136 + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
137 if test -n "${nvidia_cards}"; then
138 addpredict "${nvidia_cards}"
139 fi
140 @@ -119,6 +124,8 @@ src_configure() {
141 local openmp=disable
142 use openmp && { tc-has-openmp && openmp=enable; }
143
144 + use perl && perl_check_env
145 +
146 [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
147
148 local myeconfargs=(
149 @@ -145,6 +152,7 @@ src_configure() {
150 $(use_with truetype freetype)
151 $(use_with postscript gslib)
152 $(use_with graphviz gvc)
153 + $(use_with heif heic)
154 $(use_with jbig)
155 $(use_with jpeg)
156 $(use_with jpeg2k openjp2)
157 @@ -211,7 +219,7 @@ pkg_postinst() {
158 else
159 local v
160 for v in ${REPLACING_VERSIONS}; do
161 - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
162 + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
163 # This is an upgrade
164 _show_policy_xml_notice=yes
165
166 @@ -222,7 +230,7 @@ pkg_postinst() {
167 fi
168
169 if [[ -n "${_show_policy_xml_notice}" ]]; then
170 - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
171 + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
172 elog "which will prevent the usage of the following coders by default:"
173 elog ""
174 elog " - PS"
Report Message
Find on MARC Find on Google Groups