summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-07 16:01:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-07 16:01:07 +0000
commit75e4920c8c262462f85a5188a354d8415182f5a4 (patch)
tree4b5341eb8e8c3c9319916850fad8621889cb7821 /media-gfx
parentClean up src_configure(). (diff)
downloadgentoo-2-75e4920c8c262462f85a5188a354d8415182f5a4.tar.gz
gentoo-2-75e4920c8c262462f85a5188a354d8415182f5a4.tar.bz2
gentoo-2-75e4920c8c262462f85a5188a354d8415182f5a4.zip
Restore src_test() logic wrt #411155 by Jeroen Roovers
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/imagemagick/ChangeLog6
-rw-r--r--media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 0475b11dad76..d41bcedfcebb 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.471 2012/04/07 15:03:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.472 2012/04/07 16:01:07 ssuominen Exp $
+
+ 07 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.7.6.4.ebuild:
+ Restore src_test() logic wrt #411155 by Jeroen Roovers
07 Apr 2012; Markus Meier <maekke@gentoo.org> imagemagick-6.7.6.4.ebuild:
arm stable, bug #410867
diff --git a/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild b/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
index 2e779a54e5b1..41c051587136 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.4 2012/04/07 15:03:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.5 2012/04/07 16:01:07 ssuominen Exp $
EAPI=4
inherit multilib toolchain-funcs versionator
@@ -129,7 +129,11 @@ src_configure() {
}
src_test() {
- has_version media-gfx/imagemagick || emake -j1 check
+ if has_version ~${CATEGORY}/${P}; then
+ emake -j1 check
+ else
+ ewarn "Skipping testsuite because installed version doesn't match."
+ fi
}
src_install() {