1 |
commit: 631dc94c1539276d1ccc56e3a74ca35bc71bf9f3 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 10 15:57:47 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 10 15:58:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631dc94c |
7 |
|
8 |
media-gfx/imagemagick: bump to v6.9.11-0 & v7.0.10-0 |
9 |
|
10 |
Package-Manager: Portage-2.3.91, Repoman-2.3.20 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
media-gfx/imagemagick/Manifest | 2 + |
14 |
...ick-9999.ebuild => imagemagick-6.9.11.0.ebuild} | 50 ++++++++-------------- |
15 |
...ick-9999.ebuild => imagemagick-7.0.10.0.ebuild} | 4 +- |
16 |
media-gfx/imagemagick/imagemagick-9999.ebuild | 4 +- |
17 |
4 files changed, 25 insertions(+), 35 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest |
20 |
index 02b4aea10ea..ffa4b2b0030 100644 |
21 |
--- a/media-gfx/imagemagick/Manifest |
22 |
+++ b/media-gfx/imagemagick/Manifest |
23 |
@@ -1,2 +1,4 @@ |
24 |
DIST ImageMagick-6.9.10-96.tar.xz 9071708 BLAKE2B e122275c2b18527ecd1e1086ccb636c5cea7c895b5540fffc39a98a7f0ac44dfddfc706668dd5a5c0bfd0f3d3037efe4576d200391e4f9dee821b82db3b02f75 SHA512 d1502c287bf0d592e4271d84bdbe9b17c8bd0aeff2bcb374d13b482c3c19deade1b96360a58972872a46c0677ebab8b84af6d0e4036a7a271cf615362e6086b9 |
25 |
+DIST ImageMagick-6.9.11-0.tar.xz 9072040 BLAKE2B 8e3df83c5a009e3a03599a20b9bc2d6f1e91add659d8de150a4ebeafb91218bc62aac25c755a6a1010e00c2d14853a0d8a4849e2b55c899587acdf2d28d8b7c5 SHA512 fe6786365dfe8973e4660f4070cb85335f88985ec9e2484fe382d1f5c1f0123476cdf8e976107072b5ed13b05190f906be89e5215e16dc62e5daebe3ede40bf2 |
26 |
+DIST ImageMagick-7.0.10-0.tar.xz 9532856 BLAKE2B 510e1ac8010b7e2267950e868ce8d0fcd36e37c936c67b1603f4dfdc247cda8dd4aa59fc0d88f5d2a2c0a9a199331cca834797f315814964b68dfad1ab24f355 SHA512 d997429855fa4bc48da32e00ea5c45467a6bd3265c35c0aff8f150346e467451737f276833d4fa867f0e2e52110f532416af1dafdbc8e81d2d11dd0c4c80f011 |
27 |
DIST ImageMagick-7.0.9-26.tar.xz 9493028 BLAKE2B 84d3f0bb59238db3e3a0c0f40b4b4b428dc81168468d4d9e7a0f00c74e46102c9c9444891236b105f293080f9601c7ed63ad4592a8ef622554b3aa0c043bf2fb SHA512 0488c6e0e0315bd5390cea952f7acb217e3c651c325f2cd4cb02475c25f7f721a31b20b53bb8b6dce064cedfbfd51711a34627fbb8a8c515636e7627ceda67ed |
28 |
|
29 |
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild |
30 |
similarity index 82% |
31 |
copy from media-gfx/imagemagick/imagemagick-9999.ebuild |
32 |
copy to media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild |
33 |
index 8d8ee8a769b..9e9f184c44f 100644 |
34 |
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild |
35 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild |
36 |
@@ -1,35 +1,27 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
-EAPI="7" |
42 |
+EAPI="6" |
43 |
|
44 |
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib |
45 |
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib |
46 |
|
47 |
-if [[ ${PV} == "9999" ]] ; then |
48 |
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" |
49 |
- inherit git-r3 |
50 |
- MY_P="imagemagick-9999" |
51 |
-else |
52 |
- MY_PV="$(ver_rs 3 '-')" |
53 |
- MY_P="ImageMagick-${MY_PV}" |
54 |
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
55 |
- 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" |
56 |
-fi |
57 |
+MY_PV="$(ver_rs 3 '-')" |
58 |
+MY_P="ImageMagick-${MY_PV}" |
59 |
|
60 |
DESCRIPTION="A collection of tools and libraries for many image formats" |
61 |
HOMEPAGE="https://www.imagemagick.org/" |
62 |
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
63 |
|
64 |
LICENSE="imagemagick" |
65 |
-SLOT="0/7.0.9" |
66 |
+SLOT="0/6.9.11" |
67 |
+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" |
68 |
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" |
69 |
-RESTRICT="!test? ( test )" |
70 |
|
71 |
REQUIRED_USE="corefonts? ( truetype ) |
72 |
test? ( corefonts )" |
73 |
|
74 |
-RESTRICT="!test? ( test )" |
75 |
- |
76 |
-BDEPEND="virtual/pkgconfig" |
77 |
+RESTRICT="perl? ( userpriv ) |
78 |
+ !test? ( test )" |
79 |
|
80 |
RDEPEND=" |
81 |
dev-libs/libltdl:0 |
82 |
@@ -70,12 +62,13 @@ RDEPEND=" |
83 |
xml? ( dev-libs/libxml2:= ) |
84 |
lzma? ( app-arch/xz-utils ) |
85 |
zlib? ( sys-libs/zlib:= )" |
86 |
- |
87 |
DEPEND="${RDEPEND} |
88 |
!media-gfx/graphicsmagick[imagemagick] |
89 |
+ virtual/pkgconfig |
90 |
X? ( x11-base/xorg-proto )" |
91 |
|
92 |
S="${WORKDIR}/${MY_P}" |
93 |
+#S="${WORKDIR}/ImageMagick6-${MY_PV}" |
94 |
|
95 |
src_prepare() { |
96 |
default |
97 |
@@ -93,7 +86,7 @@ src_prepare() { |
98 |
elibtoolize # for Darwin modules |
99 |
|
100 |
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
101 |
- local ati_cards mesa_cards nvidia_cards render_cards |
102 |
+ local mesa_cards ati_cards nvidia_cards render_cards |
103 |
shopt -s nullglob |
104 |
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
105 |
if test -n "${ati_cards}"; then |
106 |
@@ -103,7 +96,7 @@ src_prepare() { |
107 |
if test -n "${mesa_cards}"; then |
108 |
addpredict "${mesa_cards}" |
109 |
fi |
110 |
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') |
111 |
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') |
112 |
if test -n "${nvidia_cards}"; then |
113 |
addpredict "${nvidia_cards}" |
114 |
fi |
115 |
@@ -155,7 +148,6 @@ src_configure() { |
116 |
$(use_with jbig) |
117 |
$(use_with jpeg) |
118 |
$(use_with jpeg2k openjp2) |
119 |
- --without-jxl |
120 |
$(use_with lcms) |
121 |
$(use_with lqr) |
122 |
$(use_with lzma) |
123 |
@@ -184,12 +176,8 @@ src_test() { |
124 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
125 |
|
126 |
local im_command= IM_COMMANDS=() |
127 |
- if [[ ${PV} == "9999" ]] ; then |
128 |
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild |
129 |
- else |
130 |
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
131 |
- fi |
132 |
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
133 |
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
134 |
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used |
135 |
IM_COMMANDS+=( "emake check" ) # Run tests |
136 |
|
137 |
for im_command in "${IM_COMMANDS[@]}"; do |
138 |
@@ -206,7 +194,7 @@ src_install() { |
139 |
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ |
140 |
install |
141 |
|
142 |
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} |
143 |
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} |
144 |
dodoc {AUTHORS,README}.txt ChangeLog |
145 |
|
146 |
if use perl; then |
147 |
@@ -238,7 +226,7 @@ pkg_postinst() { |
148 |
else |
149 |
local v |
150 |
for v in ${REPLACING_VERSIONS}; do |
151 |
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then |
152 |
+ if ! ver_test "${v}" -gt "6.9.10.10-r2"; then |
153 |
# This is an upgrade |
154 |
_show_policy_xml_notice=yes |
155 |
|
156 |
@@ -249,7 +237,7 @@ pkg_postinst() { |
157 |
fi |
158 |
|
159 |
if [[ -n "${_show_policy_xml_notice}" ]]; then |
160 |
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" |
161 |
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" |
162 |
elog "which will prevent the usage of the following coders by default:" |
163 |
elog "" |
164 |
elog " - PS" |
165 |
|
166 |
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild |
167 |
similarity index 99% |
168 |
copy from media-gfx/imagemagick/imagemagick-9999.ebuild |
169 |
copy to media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild |
170 |
index 8d8ee8a769b..6b8545f0e37 100644 |
171 |
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild |
172 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild |
173 |
@@ -1,4 +1,4 @@ |
174 |
-# Copyright 1999-2019 Gentoo Authors |
175 |
+# Copyright 1999-2020 Gentoo Authors |
176 |
# Distributed under the terms of the GNU General Public License v2 |
177 |
|
178 |
EAPI="7" |
179 |
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats" |
180 |
HOMEPAGE="https://www.imagemagick.org/" |
181 |
|
182 |
LICENSE="imagemagick" |
183 |
-SLOT="0/7.0.9" |
184 |
+SLOT="0/7.0.10" |
185 |
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" |
186 |
RESTRICT="!test? ( test )" |
187 |
|
188 |
|
189 |
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild |
190 |
index 8d8ee8a769b..6b8545f0e37 100644 |
191 |
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild |
192 |
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild |
193 |
@@ -1,4 +1,4 @@ |
194 |
-# Copyright 1999-2019 Gentoo Authors |
195 |
+# Copyright 1999-2020 Gentoo Authors |
196 |
# Distributed under the terms of the GNU General Public License v2 |
197 |
|
198 |
EAPI="7" |
199 |
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats" |
200 |
HOMEPAGE="https://www.imagemagick.org/" |
201 |
|
202 |
LICENSE="imagemagick" |
203 |
-SLOT="0/7.0.9" |
204 |
+SLOT="0/7.0.10" |
205 |
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" |
206 |
RESTRICT="!test? ( test )" |