From 2fd4e311fbf1f55619b9d81f5a228b5804af6720 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 6 Apr 2014 14:07:12 +0000 Subject: Utilize LD_LIBRARY_PATH to avoid system copy of ImageMagick for tests by Nikoli (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) --- media-gfx/imagemagick/ChangeLog | 7 ++++++- media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'media-gfx/imagemagick') diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index c2ea8d7e607d..80c74535b7e7 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.544 2014/04/06 12:32:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.545 2014/04/06 14:07:12 ssuominen Exp $ + + 06 Apr 2014; Samuli Suominen + imagemagick-6.8.8.10.ebuild: + Utilize LD_LIBRARY_PATH to avoid system copy of ImageMagick for tests by + Nikoli 06 Apr 2014; Samuli Suominen imagemagick-6.8.8.10.ebuild: diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild index 20cd93b24da3..e0f995332d13 100644 --- a/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild,v 1.4 2014/04/06 12:32:14 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild,v 1.5 2014/04/06 14:07:12 ssuominen Exp $ EAPI=5 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator @@ -138,11 +138,8 @@ src_configure() { } src_test() { - if has_version ~${CATEGORY}/${P}; then - emake -j1 check - else - ewarn "Skipping testsuite because installed version doesn't match." - fi + LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ + emake -j1 check } src_install() { -- cgit v1.2.3-65-gdbad