Use lcms2 instead of lcms because upstream ./configure logic prefers new version.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index dc6023f86c781c944acb51e23b00693fde8adb8c..011f83318cdedeaeaeff92873c9fd06b75d02180 100644 (file)
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.403 2010/06/20 18:24:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.404 2010/06/21 09:19:45 ssuominen Exp $
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  imagemagick-6.6.2.5.ebuild:
+  Use lcms2 instead of lcms because upstream ./configure logic prefers new
+  version.
 
 *imagemagick-6.6.2.5 (20 Jun 2010)
 

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ef232adc52b2a905325c23ad0bbdabcf33be2bbf..014b4e081bc6761579545c2965b41124c57f8201 100644 (file)
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,6 @@
 DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2caf94c243 SHA1 c57d80607a4a4b90e10e718f95cde380915169a7 SHA256 e510045d6aca949092f696b6b4e2994cf22693408f067e4ae9a00f66c414910a
 DIST ImageMagick-6.6.2-5.tar.xz 6469864 RMD160 4d53b8d20b27147affebfb703e8996ab8b28d8ac SHA1 8a803b5e29901e4aba44d3f6561686926d5a1817 SHA256 4cbf14efa8076717bd7de19dc2db398ec24c28452d0b1f2a8ebfe9876342c838
 EBUILD imagemagick-6.6.1.2.ebuild 3827 RMD160 11df027e97ad49e526b8e7cd472aed446048ffd3 SHA1 bb82c14c190f10923cdbd68aaa3957ee9cfa740f SHA256 8f4fd196f33962b3bc8b1a9c7182228a102187e1b1986c23b8d28c42733cb60e
-EBUILD imagemagick-6.6.2.5.ebuild 3935 RMD160 b7868a17fa65523bf27e5225444f65104eef3929 SHA1 77f86e635463e49752baf5762ec6e5960c9cb1d7 SHA256 558a4c8b4d4346b804d9c6c28778b946fde3096c7a68476d71955eff10578866
-MISC ChangeLog 60130 RMD160 f13cf1ba97873cf2b1b7ddb8cec058664b2c3551 SHA1 76e5f0081810010eae5a7de6a846759d753e0142 SHA256 41a022a8a4e1d44f3a54cc43c2cc95a13779fb9d9ef0ced583754d574ca4b88d
+EBUILD imagemagick-6.6.2.5.ebuild 3935 RMD160 e373fc82361d094a7152c64ff6d8d6a085bdeaf7 SHA1 d256f634518da8dcdfb664621c23fcd45f31f297 SHA256 ade788f5c3678c4e5d2ee01bdfbbddf6ed9f8f5ad79d41ff3eac69e9f394e61c
+MISC ChangeLog 60304 RMD160 d871b5bdbccb9147ec0ee06886c1fce7ed94859f SHA1 6c07446aafc5dbe7313fa916d845edad13dc4e1f SHA256 957bee6a5588be20c51346446ba2a952152b7da09601012cf7f770c779aaf2ca
 MISC metadata.xml 693 RMD160 3d73c1e6455b55208ac7a4abd4d556295593de54 SHA1 22ea72770cf75bcfc6a81601a6924156e3121eb5 SHA256 c00ef1edb16bf403dadde0e61623797ead912e9ec4d9b6ae2fa71ece47857d09

diff --git a/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild b/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild
index 7bf0c55a176da06b3b5528084c57ae37e2f68286..61d89be4211570bee563fb46f1546e0cc12ca79b 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild,v 1.1 2010/06/20 18:24:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild,v 1.2 2010/06/21 09:19:45 ssuominen Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -31,7 +31,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
        jbig? ( media-libs/jbigkit )
        jpeg? ( >=media-libs/jpeg-6b:0 )
        jpeg2k? ( media-libs/jasper )
-       lcms? ( >=media-libs/lcms-1.06 )
+       lcms? ( =media-libs/lcms-2* )
        lqr? ( >=media-libs/liblqr-0.1.0 )
        openexr? ( media-libs/openexr )
        perl? ( >=dev-lang/perl-5.8.6-r6 )