Explicitly depend on sci-libs/fftw:3.0 (bug #362569 by Slava Gorbunov) and use slot deps for lcms and freetype.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

4 files changed, 19 insertions, 14 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 17d73283611b..0d1ef1adf27a 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.431 2011/06/01 16:21:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.432 2011/06/09 06:06:06 radhermit Exp $
+
+  09 Jun 2011; Tim Harder <radhermit@gentoo.org> imagemagick-6.6.5.6.ebuild,
+  imagemagick-6.6.7.6.ebuild, imagemagick-6.6.8.5.ebuild:
+  Explicitly depend on sci-libs/fftw:3.0 (bug #362569 by Slava Gorbunov) and
+  use slot deps for lcms and freetype.
 
   01 Jun 2011; Tobias Klausmann <klausman@gentoo.org>
   imagemagick-6.6.8.5.ebuild:
diff --git a/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild b/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild
index 444782f0ed0e..265a7ada77b1 100644
--- a/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild,v 1.8 2010/12/27 00:54:47 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild,v 1.9 2011/06/09 06:06:06 radhermit Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -21,7 +21,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw )
+	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
@@ -29,7 +29,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
-	lcms? ( =media-libs/lcms-2* )
+	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
@@ -37,7 +37,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	raw? ( media-gfx/ufraw )
 	svg? ( >=gnome-base/librsvg-2.9.0 )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
+	truetype? ( media-libs/freetype:2
 		corefonts? ( media-fonts/corefonts ) )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
diff --git a/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild b/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild
index d09e9108f6d6..2708508ad393 100644
--- a/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild,v 1.1 2011/02/15 17:34:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild,v 1.2 2011/06/09 06:06:06 radhermit Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -21,7 +21,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw )
+	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
@@ -29,7 +29,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
-	lcms? ( =media-libs/lcms-2* )
+	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
@@ -37,7 +37,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	raw? ( media-gfx/ufraw )
 	svg? ( >=gnome-base/librsvg-2.9.0 )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
+	truetype? ( media-libs/freetype:2
 		corefonts? ( media-fonts/corefonts ) )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
diff --git a/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild b/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
index 300ee2c91161..3039fc26be65 100644
--- a/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild,v 1.7 2011/06/01 16:21:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild,v 1.8 2011/06/09 06:06:06 radhermit Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -22,7 +22,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw )
+	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
@@ -30,7 +30,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
-	lcms? ( =media-libs/lcms-2* )
+	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
@@ -38,7 +38,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	raw? ( media-gfx/ufraw )
 	svg? ( >=gnome-base/librsvg-2.9.0 )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
+	truetype? ( media-libs/freetype:2
 		corefonts? ( media-fonts/corefonts ) )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 	webp? ( media-libs/libwebp )