diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-12-11 14:30:00 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-12-11 14:44:38 +0100 |
| commit | 3cb38722606339551a29bc92c19c3506d3571900 (patch) | |
| tree | 91f047f1cc58682542092b54a6542cac13a5bc2f | |
| parent | dev-libs/liblinebreak: Remove last-rited pkg (diff) | |
| download | gentoo-3cb38722606339551a29bc92c19c3506d3571900.tar.gz gentoo-3cb38722606339551a29bc92c19c3506d3571900.tar.bz2 gentoo-3cb38722606339551a29bc92c19c3506d3571900.zip | |
media-gfx/imagemagick: use "identify" utility in test phase in IM 6
"magick" utility is IM 7+ only [Link 1].
Link 1: https://github.com/ImageMagick/ImageMagick/commit/fa1e43d6abadec9f10938d14052df38ed570f99f
Reported-by: Hans de Graaff <graaff@gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 12 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild index ba0ba14a935f..1cc2c6cf11a1 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild @@ -5,7 +5,8 @@ EAPI="6" inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib -MY_P=ImageMagick-$(ver_rs 3 '-') +MY_PV="$(ver_rs 3 '-')" +MY_P="ImageMagick-${MY_PV}" DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" @@ -173,13 +174,14 @@ src_test() { die "Failed to install default blank policy.xml in '${_im_local_config_home}'" local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built - 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 - "${S}"/magick.sh \ - ${im_command} || die + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" done } diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild index 59b9a3439321..51d1439ebc56 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild @@ -5,7 +5,8 @@ EAPI="6" inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib -MY_P=ImageMagick-$(ver_rs 3 '-') +MY_PV="$(ver_rs 3 '-')" +MY_P="ImageMagick-${MY_PV}" DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" @@ -173,13 +174,14 @@ src_test() { die "Failed to install default blank policy.xml in '${_im_local_config_home}'" local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built - 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 - "${S}"/magick.sh \ - ${im_command} || die + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" done } |