| 1 |
commit: 3cb38722606339551a29bc92c19c3506d3571900 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 13:30:00 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 13:44:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb38722 |
| 7 |
|
| 8 |
media-gfx/imagemagick: use "identify" utility in test phase in IM 6 |
| 9 |
|
| 10 |
"magick" utility is IM 7+ only [Link 1]. |
| 11 |
|
| 12 |
Link 1: https://github.com/ImageMagick/ImageMagick/commit/fa1e43d6abadec9f10938d14052df38ed570f99f |
| 13 |
Reported-by: Hans de Graaff <graaff <AT> gentoo.org> |
| 14 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 16 |
|
| 17 |
media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 12 +++++++----- |
| 18 |
media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild | 12 +++++++----- |
| 19 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 22 |
index ba0ba14a935..1cc2c6cf11a 100644 |
| 23 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 24 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild |
| 25 |
@@ -5,7 +5,8 @@ EAPI="6" |
| 26 |
|
| 27 |
inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib |
| 28 |
|
| 29 |
-MY_P=ImageMagick-$(ver_rs 3 '-') |
| 30 |
+MY_PV="$(ver_rs 3 '-')" |
| 31 |
+MY_P="ImageMagick-${MY_PV}" |
| 32 |
|
| 33 |
DESCRIPTION="A collection of tools and libraries for many image formats" |
| 34 |
HOMEPAGE="https://www.imagemagick.org/" |
| 35 |
@@ -173,13 +174,14 @@ src_test() { |
| 36 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 37 |
|
| 38 |
local im_command= IM_COMMANDS=() |
| 39 |
- IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built |
| 40 |
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
| 41 |
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
| 42 |
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used |
| 43 |
IM_COMMANDS+=( "emake check" ) # Run tests |
| 44 |
|
| 45 |
for im_command in "${IM_COMMANDS[@]}"; do |
| 46 |
- "${S}"/magick.sh \ |
| 47 |
- ${im_command} || die |
| 48 |
+ eval "${S}"/magick.sh \ |
| 49 |
+ ${im_command} || \ |
| 50 |
+ die "Failed to run \"${im_command}\"" |
| 51 |
done |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild |
| 56 |
index 59b9a343932..51d1439ebc5 100644 |
| 57 |
--- a/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild |
| 58 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild |
| 59 |
@@ -5,7 +5,8 @@ EAPI="6" |
| 60 |
|
| 61 |
inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib |
| 62 |
|
| 63 |
-MY_P=ImageMagick-$(ver_rs 3 '-') |
| 64 |
+MY_PV="$(ver_rs 3 '-')" |
| 65 |
+MY_P="ImageMagick-${MY_PV}" |
| 66 |
|
| 67 |
DESCRIPTION="A collection of tools and libraries for many image formats" |
| 68 |
HOMEPAGE="https://www.imagemagick.org/" |
| 69 |
@@ -173,13 +174,14 @@ src_test() { |
| 70 |
die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 71 |
|
| 72 |
local im_command= IM_COMMANDS=() |
| 73 |
- IM_COMMANDS+=( "magick -version" ) # Verify that we are using version we just built |
| 74 |
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used |
| 75 |
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
| 76 |
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used |
| 77 |
IM_COMMANDS+=( "emake check" ) # Run tests |
| 78 |
|
| 79 |
for im_command in "${IM_COMMANDS[@]}"; do |
| 80 |
- "${S}"/magick.sh \ |
| 81 |
- ${im_command} || die |
| 82 |
+ eval "${S}"/magick.sh \ |
| 83 |
+ ${im_command} || \ |
| 84 |
+ die "Failed to run \"${im_command}\"" |
| 85 |
done |
| 86 |
} |
Archives