From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C581138334 for ; Tue, 11 Dec 2018 13:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62396E0AB7; Tue, 11 Dec 2018 13:44:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 312FEE0AB7 for ; Tue, 11 Dec 2018 13:44:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91CA0335C36 for ; Tue, 11 Dec 2018 13:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C045D42F for ; Tue, 11 Dec 2018 13:44:46 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1544535878.3cb38722606339551a29bc92c19c3506d3571900.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild media-gfx/imagemagick/imagemagick-6.9.10.16.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 3cb38722606339551a29bc92c19c3506d3571900 X-VCS-Branch: master Date: Tue, 11 Dec 2018 13:44:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5aa56fec-83d3-41cd-83fd-467c490b6f60 X-Archives-Hash: a771a69ed17cabefdcb65415f5881470 commit: 3cb38722606339551a29bc92c19c3506d3571900 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Dec 11 13:30:00 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Dec 11 13:44:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb38722 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 gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> media-gfx/imagemagick/imagemagick-6.9.10.14.ebuild | 12 +++++++----- 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 ba0ba14a935..1cc2c6cf11a 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 59b9a343932..51d1439ebc5 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 }