commit: 6827095e6917388a3a8a5241cb00ee00dbdc2d25
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 18:07:45 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 18:12:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6827095e
media-gfx/imagemagick: bump to v6.9.12-7 & v7.0.11-7
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-gfx/imagemagick/Manifest | 2 ++
...emagick-9999.ebuild => imagemagick-6.9.12.7.ebuild} | 18 ++++++------------
...emagick-9999.ebuild => imagemagick-7.0.11.7.ebuild} | 1 -
media-gfx/imagemagick/imagemagick-9999.ebuild | 1 -
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2fe6bc9703e..74755137489 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,4 @@
DIST ImageMagick-6.9.12-6.tar.xz 9160640 BLAKE2B
948da0a68eef0c570f9732b58f416ab945defdcd8250c579df493fc3871c318b48b6a1664aa15aacaf98a69928d96b56788262b39d84f06f55fdf60ea4048280
SHA512
815b760ce61f3087738735fed9bf9bbae27993235897a86250ac1841eb99e021f1c55307ac8ea89d7353c944c404069e7f498a65f238633a200d972512197f8f
+DIST ImageMagick-6.9.12-7.tar.xz 9156816 BLAKE2B
56a13ff744b15fb987232b70d9ea2a14b10de709011375da2b970e408d91079be38ccc5a301308734293c18c81d78a2e68ecee56b7d8478c6222cd7745b847ab
SHA512
cfb261c60c07bc52cd491173a17040b33b0fa95f396d933fe9e14767cb5d009a8ebe7194949c2387c723d3a0492bc7b7a078ed89ce8a0024dd8ed73b40748d4c
DIST ImageMagick-7.0.11-6.tar.xz 10286508 BLAKE2B
155c185adc5bd3a5e4f4c2b0c713ee76f5217451ada3ca2968147c4980d0ea8789945e8a87ae50535f638f7deca841425fa71edc34cd242b9958ef98cc3afb71
SHA512
ed9066dbc5fe8494e153f635318a4a54a1735167c78b703eeda232675c427a171923983a1bb493059432becdd65171c8ac4eb6432048e2abeff4290c899c6e57
+DIST ImageMagick-7.0.11-7.tar.xz 10280524 BLAKE2B
a4d0cb3e157bff25245d6c3bf3eba55d6f3693ba66d8c5efbc757b31077b1bac0753dca095f853455793355e92e8376a8e41acf3809115c6dbae47977190c42d
SHA512
5c36aa566892f0e473ccec0058d7113779704cdf8f4d747132434216c9c0f304de5aafbbbcacc4b21d7e6224e3b9c9439fe6b446e28e821f614c2d1026a280e7
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
similarity index 92%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
index 5256a3f29d2..d17773f5081 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
inherit git-r3
MY_P="imagemagick-9999"
else
@@ -20,9 +20,8 @@ DESCRIPTION="A collection of tools and libraries for many
image formats"
HOMEPAGE="https://www.imagemagick.org/";
LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
+SLOT="0/6.9.11-60"
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"
-RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
svg? ( xml )
@@ -159,7 +158,6 @@ src_configure() {
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
- --without-jxl
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
@@ -188,12 +186,8 @@ src_test() {
die "Failed to install default blank policy.xml in
'${_im_local_config_home}'"
local im_command= IM_COMMANDS=()
- if [[ ${PV} == "9999" ]] ; then
- IM_COMMANDS+=( "magick -version" ) # Show version we are using
-- cannot verify because of live ebuild
- else
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) #
Verify that we are using version we just built
- fi
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify
that we are using version we just built
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is
used
IM_COMMANDS+=( "emake check" ) # Run tests
for im_command in "${IM_COMMANDS[@]}"; do
@@ -244,7 +238,7 @@ pkg_postinst() {
else
local v
for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+ if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
# This is an upgrade
_show_policy_xml_notice=yes
@@ -255,7 +249,7 @@ pkg_postinst() {
fi
if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in
/etc/ImageMagick-7"
+ elog "For security reasons, a policy.xml file was installed in
/etc/ImageMagick-6"
elog "which will prevent the usage of the following coders by
default:"
elog ""
elog " - PS"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
similarity index 99%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
index 5256a3f29d2..769cb4c0e00 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
@@ -22,7 +22,6 @@ HOMEPAGE="https://www.imagemagick.org/";
LICENSE="imagemagick"
SLOT="0/7.0.11-0"
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"
-RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
svg? ( xml )
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 5256a3f29d2..769cb4c0e00 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -22,7 +22,6 @@ HOMEPAGE="https://www.imagemagick.org/";
LICENSE="imagemagick"
SLOT="0/7.0.11-0"
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"
-RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
svg? ( xml )
