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

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

commit:     bf8b327562c1f785027ea79d8eda5d6ac0d0308e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 18:16:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 18:21:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8b3275

media-gfx/imagemagick: bump to v7.0.9-2

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/imagemagick/Manifest                            |  1 +
 ...imagemagick-9999.ebuild => imagemagick-7.0.9.2.ebuild} | 15 +++++++++------
 media-gfx/imagemagick/imagemagick-9999.ebuild             | 15 +++++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4a1e693071a..439882e26db 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,3 @@
 DIST ImageMagick-6.9.10-71.tar.xz 9071596 BLAKE2B aab31bf2ee8717cbd394484a79430d7e1d415c795867cc70e8a6c3ec066fd2ca1527eb51a1d99dace366c62abec36f11202c3ea4602d6c1c12c8ad00be09299d SHA512 ff0a43d1afb327510c33eb515bb6789c7bd7478dbf65d4e98a86fd0446c5b24b5bbacd6dced3e87fc804563fb592c325f92188a8e43845eb1acf3a0a70f05bd5
 DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
+DIST ImageMagick-7.0.9-2.tar.xz 9475956 BLAKE2B e2912f497b148c406d13223e349a95dccb40f377e49e58119933113324c6424c1627d918d6d2f6400e3470bdfb24c546851a072f389d9e8fec19de5d1a8176a0 SHA512 d584e467bc9e7ff90b1a4f715c792ffd272574da2efefb0cc39fbaa2ad225eed2fc12936785dea44755158a23c3a8397754feba07e442249e535a7b12388ae90

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
similarity index 96%
copy from media-gfx/imagemagick/imagemagick-9999.ebuild
copy to media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
index 1d5c3d2d7d7..d27633e5c49 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,9 +20,11 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
 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"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
 	dev-libs/libltdl:0
 	bzip2? ( app-arch/bzip2 )
@@ -62,9 +64,9 @@ RDEPEND="
 	xml? ( dev-libs/libxml2:= )
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib:= )"
+
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
@@ -150,6 +152,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with jpeg)
 		$(use_with jpeg2k openjp2)
+		--without-jxl
 		$(use_with lcms)
 		$(use_with lqr)
 		$(use_with lzma)
@@ -200,7 +203,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then

diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 1d5c3d2d7d7..d27633e5c49 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,9 +20,11 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
 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"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
 	dev-libs/libltdl:0
 	bzip2? ( app-arch/bzip2 )
@@ -62,9 +64,9 @@ RDEPEND="
 	xml? ( dev-libs/libxml2:= )
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib:= )"
+
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
@@ -150,6 +152,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with jpeg)
 		$(use_with jpeg2k openjp2)
+		--without-jxl
 		$(use_with lcms)
 		$(use_with lqr)
 		$(use_with lzma)
@@ -200,7 +203,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then