[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     2585b4fc7edb21cabe5e1632233b951a49227aaa
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 14:19:11 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 14:40:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2585b4fc

media-gfx/imagemagick: bump to v6.9.12-15 & v7.1.0-0

Closes: https://bugs.gentoo.org/792501
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/imagemagick/Manifest                      |  2 ++
 ...ick-9999.ebuild => imagemagick-6.9.12.15.ebuild} | 21 +++++++--------------
 ...agick-9999.ebuild => imagemagick-7.1.0.0.ebuild} |  2 +-
 media-gfx/imagemagick/imagemagick-9999.ebuild       |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index bceab3798c4..183b3d22195 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,6 @@
 DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
 DIST ImageMagick-6.9.12-13.tar.xz 9172456 BLAKE2B cc931e49f152945a0022f6e57e49db08dc45169d5913b884cdf47d18d1f3d7a453f02b3ade56395e985cbe3f996584b8ad1686d947b6b4c04cc85475ca4f65c4 SHA512 4273e6cc864e759c55b5612475c268095948bb0ebabc1188637df87ac8595a97ce94ef7307687f0abd1325646ba23a8bf1219081655307b17ec96b335a01de6c
+DIST ImageMagick-6.9.12-15.tar.xz 9181060 BLAKE2B 099482e71ce899a95e22dd63ae4e3f0a36ed722f318a22796e5b28552d9c3770f33fef9d3dbeebbdcf91e78ac30421e7e48f9a3db7fdf73bfbdbafea4894ddc5 SHA512 7336b832abf96fed5d0f861b9c3724c27770a4f9fa868399406bb49003184a06a5fc51a96d3c66fa8d1ca85bcdfaa9ed59d9e80c751ae4c660f38f4d50a931ef
 DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
 DIST ImageMagick-7.0.11-13.tar.xz 10305476 BLAKE2B 464ea44f8e31148bdcbdf2e66410e5eb9fe0526d06b2b1376311018f7e4897648601d5f4d541469e9f8a72ecbc279695f23288e90725e564a917f68df92f8aed SHA512 8b5fe1ad06ca3af752454f67f53a066842668832bbd4efede35c515449cd2b970e6f7f23e716928ba598f89a7ec020bd988cc392196c89117586fb97a48e1d9e
+DIST ImageMagick-7.1.0-0.tar.xz 10307628 BLAKE2B cd59142d40fffa583e19b5bb3016ad84afd1901c3dc679798341f764ff2b341f85a5049907c560eeb58866ccb21985910a99ea92a5ca734d60e5af35fbbe8378 SHA512 51a52ee2c09bb8ea276445393cc2f3398a54c10047d58eaea29a1a1d231ddae0fc00d81b930f299661fed0a3940c08e8c9f0b3932ffd46128186348ebb89fb00

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
similarity index 92%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
index e38924ebd0f..d17773f5081 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.15.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,8 +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"
-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"
+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"
 
 REQUIRED_USE="corefonts? ( truetype )
 	svg? ( xml )
@@ -72,7 +72,6 @@ RDEPEND="
 		)
 	xml? ( dev-libs/libxml2:= )
 	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
 	zlib? ( sys-libs/zlib:= )"
 
 DEPEND="${RDEPEND}
@@ -144,7 +143,6 @@ src_configure() {
 		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
 		$(use_with bzip2 bzlib)
 		$(use_with X x)
-		$(use_with zip)
 		$(use_with zlib)
 		--without-autotrace
 		$(use_with postscript dps)
@@ -160,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)
@@ -189,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
@@ -245,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
 
@@ -256,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.1.0.0.ebuild
similarity index 99%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
index e38924ebd0f..3f1ab1fd0bf 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
@@ -20,7 +20,7 @@ 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/7.1.0-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 zip zlib"
 
 REQUIRED_USE="corefonts? ( truetype )

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index e38924ebd0f..3f1ab1fd0bf 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -20,7 +20,7 @@ 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/7.1.0-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 zip zlib"
 
 REQUIRED_USE="corefonts? ( truetype )