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

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

5 files changed, 30 insertions, 21 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/Manifest b/media-gfx/imagemagick/Manifest
index 8d44abd615b2..ad0cf911e522 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,15 +4,19 @@ Hash: SHA1
 DIST ImageMagick-6.6.5-6.tar.xz 6314756 RMD160 9c2d96bc1210356305096b27f2d829a8d3445356 SHA1 c129c813bd73deae5ec21491e8121f365bbdd7b3 SHA256 585a8372deb2052906c8fc74e84f96d72b711a08f804a4952cbb4c21fc4538fe
 DIST ImageMagick-6.6.7-6.tar.xz 7579776 RMD160 430a59204360abcc4180c33d99b53e0e352974f3 SHA1 054d1f22d173607cedb6acd7666b80d997ba2f44 SHA256 1b2ae5325847b37656a6486dbce9129b0ae37334d2f971835bbe0cf7c6542ba1
 DIST ImageMagick-6.6.8-5.tar.xz 7637460 RMD160 bc3b8c30ad8bf603106a19cdbd1c7f2908454dfd SHA1 ec80517e020c5800cdcf5bdf2b0c968009e7a439 SHA256 cbbf9f84daf837141b5a0d9bb4ffafb2263f6c23e661c405546deb7be603d919
-EBUILD imagemagick-6.6.5.6.ebuild 4112 RMD160 e1468ad53908a8149c8157a8546e16e70b462b95 SHA1 070fda24f67d9406482fa320e04389d311e8b8d4 SHA256 773f6c3f163647567d649d3fac31fcd53e3d6e1bc18b71d7255d37907912a417
-EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 391c85d3780f097d00b96d9fab54e77c22747979 SHA1 f467db5008048be8d8d983f2d723b5320b5013ff SHA256 68b00107a07f04eaeb1fc10a446f17d9c3f08d6c85602d1f93bae1ffa22b2e4f
-EBUILD imagemagick-6.6.8.5.ebuild 4326 RMD160 83221c04fafabe00f50765bec18931c3e05631e7 SHA1 f961362626d66d6a8f8fd45424c2bb1aebcce4d7 SHA256 f24a8de39f7038c328531efda10fb4e259673f2492c2232ec7c714fe600f3fef
-MISC ChangeLog 63740 RMD160 01c4a91b04addf559213a6c88847a1f277b9d7e8 SHA1 7af43c4e3270659896cf88e26a10b2a78091062d SHA256 38b6b37ababf8c2fcd13df02d9db07d6fe88a88110657533096019955d7dbf84
+EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 62448e140a1ca859702df12b0760c71800ef00ca SHA1 0650fed9e535c95a5762b8ef32bbfae132340163 SHA256 948fd844534c4312ab9b066985db340c673e6084e9fdf2db59a1931d73a0a55d
+EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 36d0bc9ad0c7168e11619790ab7de09712fbbebe SHA1 d578764b45524fa4c532fd0d47d6c11a07778628 SHA256 2e541ebf5db2b23d244873dc7686429877e3d4e447ffe08c6699277b496a07b6
+EBUILD imagemagick-6.6.8.5.ebuild 4327 RMD160 9d59f7b24be52a821b4fb0ccf6b78bfeaeeb6359 SHA1 406db0c15df2ee892a1a774b234872925033370f SHA256 e7fcddcc26e9db64a5dcbff62b9ee380d1b026522a14b911d844198584b5947b
+MISC ChangeLog 63993 RMD160 a4fa694b3e80831ed2ee0204038a42fef1a28336 SHA1 56819d54439ca971728612d9ac2e826a5a37f993 SHA256 14258f60c3e4193233ec0dd24725105cddc213aedde7f086793e323e35a4a0b0
 MISC metadata.xml 881 RMD160 644aaccd14d343a6ff6ed4fc590cf3a41c13503e SHA1 439a612d1ee5359edd173756f6bf08b75cd58687 SHA256 42fcc392603dedd8e1831e5e079a8fe2ef3330ec9edc65fcbfe3f506ebad0c21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3mZvsACgkQA+4Doc5dVOhZiwCfWrNjrwkkk+IBP64L8e+/1LTF
-BoYAn3+A26PimQ2qyu5c/p1Kwwxp/jD9
-=YYMd
+iQEcBAEBAgAGBQJN8GLUAAoJEEqz6FtPBkyjIL0IAK7EJIpHBJMa/HGeA3elCAI5
+2FgHcBuI1GvDGb64vWSeidtWf/ApLM7z/Uwx+YlpeuU4Z1PwviUR+Swlw/k00n09
+sqH00iX6ExXwIQlLnXTTlBdXUIPMhTUnImN21KqoGOUp0eoCZzeCUo0EXUf2YPcG
+x15w1RsF1XxFs8M/h5XQUvAoNI27FOa8V8U/YmQzPgwgMePS0bURqCwi2/ocAVg/
+8o515QvzdD4spq6KlhTZSxspx5yCetzXjrSAvWQ1Fce4nsVrxzUh11ZgDsGbNMrC
+oSnZSf420yGrneWWZq3vVdqZaTn9Tk1UiVY8GZ3XUgSSKrfFtP2fTAhfzmqZGUE=
+=2o88
 -----END PGP SIGNATURE-----
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 )