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: Mon, 14 Jun 2021 14:40:39
Message-Id: 1623681627.2585b4fc7edb21cabe5e1632233b951a49227aaa.whissi@gentoo
1 commit: 2585b4fc7edb21cabe5e1632233b951a49227aaa
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 14 14:19:11 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 14:40:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2585b4fc
7
8 media-gfx/imagemagick: bump to v6.9.12-15 & v7.1.0-0
9
10 Closes: https://bugs.gentoo.org/792501
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 media-gfx/imagemagick/Manifest | 2 ++
15 ...ick-9999.ebuild => imagemagick-6.9.12.15.ebuild} | 21 +++++++--------------
16 ...agick-9999.ebuild => imagemagick-7.1.0.0.ebuild} | 2 +-
17 media-gfx/imagemagick/imagemagick-9999.ebuild | 2 +-
18 4 files changed, 11 insertions(+), 16 deletions(-)
19
20 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
21 index bceab3798c4..183b3d22195 100644
22 --- a/media-gfx/imagemagick/Manifest
23 +++ b/media-gfx/imagemagick/Manifest
24 @@ -1,4 +1,6 @@
25 DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
26 DIST ImageMagick-6.9.12-13.tar.xz 9172456 BLAKE2B cc931e49f152945a0022f6e57e49db08dc45169d5913b884cdf47d18d1f3d7a453f02b3ade56395e985cbe3f996584b8ad1686d947b6b4c04cc85475ca4f65c4 SHA512 4273e6cc864e759c55b5612475c268095948bb0ebabc1188637df87ac8595a97ce94ef7307687f0abd1325646ba23a8bf1219081655307b17ec96b335a01de6c
27 +DIST ImageMagick-6.9.12-15.tar.xz 9181060 BLAKE2B 099482e71ce899a95e22dd63ae4e3f0a36ed722f318a22796e5b28552d9c3770f33fef9d3dbeebbdcf91e78ac30421e7e48f9a3db7fdf73bfbdbafea4894ddc5 SHA512 7336b832abf96fed5d0f861b9c3724c27770a4f9fa868399406bb49003184a06a5fc51a96d3c66fa8d1ca85bcdfaa9ed59d9e80c751ae4c660f38f4d50a931ef
28 DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
29 DIST ImageMagick-7.0.11-13.tar.xz 10305476 BLAKE2B 464ea44f8e31148bdcbdf2e66410e5eb9fe0526d06b2b1376311018f7e4897648601d5f4d541469e9f8a72ecbc279695f23288e90725e564a917f68df92f8aed SHA512 8b5fe1ad06ca3af752454f67f53a066842668832bbd4efede35c515449cd2b970e6f7f23e716928ba598f89a7ec020bd988cc392196c89117586fb97a48e1d9e
30 +DIST ImageMagick-7.1.0-0.tar.xz 10307628 BLAKE2B cd59142d40fffa583e19b5bb3016ad84afd1901c3dc679798341f764ff2b341f85a5049907c560eeb58866ccb21985910a99ea92a5ca734d60e5af35fbbe8378 SHA512 51a52ee2c09bb8ea276445393cc2f3398a54c10047d58eaea29a1a1d231ddae0fc00d81b930f299661fed0a3940c08e8c9f0b3932ffd46128186348ebb89fb00
31
32 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
33 similarity index 92%
34 copy from media-gfx/imagemagick/imagemagick-9999.ebuild
35 copy to media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
36 index e38924ebd0f..d17773f5081 100644
37 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
38 +++ b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
39 @@ -6,7 +6,7 @@ EAPI="7"
40 inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
41
42 if [[ ${PV} == "9999" ]] ; then
43 - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
44 + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
45 inherit git-r3
46 MY_P="imagemagick-9999"
47 else
48 @@ -20,8 +20,8 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
49 HOMEPAGE="https://www.imagemagick.org/"
50
51 LICENSE="imagemagick"
52 -SLOT="0/7.0.11-0"
53 -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 zip zlib"
54 +SLOT="0/6.9.11-60"
55 +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"
56
57 REQUIRED_USE="corefonts? ( truetype )
58 svg? ( xml )
59 @@ -72,7 +72,6 @@ RDEPEND="
60 )
61 xml? ( dev-libs/libxml2:= )
62 lzma? ( app-arch/xz-utils )
63 - zip? ( dev-libs/libzip:= )
64 zlib? ( sys-libs/zlib:= )"
65
66 DEPEND="${RDEPEND}
67 @@ -144,7 +143,6 @@ src_configure() {
68 --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
69 $(use_with bzip2 bzlib)
70 $(use_with X x)
71 - $(use_with zip)
72 $(use_with zlib)
73 --without-autotrace
74 $(use_with postscript dps)
75 @@ -160,7 +158,6 @@ src_configure() {
76 $(use_with jbig)
77 $(use_with jpeg)
78 $(use_with jpeg2k openjp2)
79 - --without-jxl
80 $(use_with lcms)
81 $(use_with lqr)
82 $(use_with lzma)
83 @@ -189,12 +186,8 @@ src_test() {
84 die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
85
86 local im_command= IM_COMMANDS=()
87 - if [[ ${PV} == "9999" ]] ; then
88 - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
89 - else
90 - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
91 - fi
92 - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
93 + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
94 + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
95 IM_COMMANDS+=( "emake check" ) # Run tests
96
97 for im_command in "${IM_COMMANDS[@]}"; do
98 @@ -245,7 +238,7 @@ pkg_postinst() {
99 else
100 local v
101 for v in ${REPLACING_VERSIONS}; do
102 - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
103 + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
104 # This is an upgrade
105 _show_policy_xml_notice=yes
106
107 @@ -256,7 +249,7 @@ pkg_postinst() {
108 fi
109
110 if [[ -n "${_show_policy_xml_notice}" ]]; then
111 - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
112 + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
113 elog "which will prevent the usage of the following coders by default:"
114 elog ""
115 elog " - PS"
116
117 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
118 similarity index 99%
119 copy from media-gfx/imagemagick/imagemagick-9999.ebuild
120 copy to media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
121 index e38924ebd0f..3f1ab1fd0bf 100644
122 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
123 +++ b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
124 @@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
125 HOMEPAGE="https://www.imagemagick.org/"
126
127 LICENSE="imagemagick"
128 -SLOT="0/7.0.11-0"
129 +SLOT="0/7.1.0-0"
130 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 zip zlib"
131
132 REQUIRED_USE="corefonts? ( truetype )
133
134 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
135 index e38924ebd0f..3f1ab1fd0bf 100644
136 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
137 +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
138 @@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
139 HOMEPAGE="https://www.imagemagick.org/"
140
141 LICENSE="imagemagick"
142 -SLOT="0/7.0.11-0"
143 +SLOT="0/7.1.0-0"
144 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 zip zlib"
145
146 REQUIRED_USE="corefonts? ( truetype )
Report Message
Find on MARC Find on Google Groups