remove useless mpeg USE-flag, add fontconfig USE-flag and correct freetype configure parameter (could fix bug #205421)

Package-Manager: portage-2.1.4_rc14

3 files changed, 23 insertions, 19 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 2882436ef729..bd60753ead8a 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.259 2008/01/07 23:10:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.260 2008/01/12 14:16:09 maekke Exp $
+
+  12 Jan 2008; Markus Meier <maekke@gentoo.org> imagemagick-6.3.7.9.ebuild:
+  remove useless mpeg USE-flag, add fontconfig USE-flag and correct freetype
+  configure parameter (could fix bug #205421)
 
   07 Jan 2008; Markus Meier <maekke@gentoo.org> -imagemagick-6.3.7.8.ebuild,
   imagemagick-6.3.7.9.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 26b9e7f67a40..f50130e0b0bf 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -60,14 +60,14 @@ EBUILD imagemagick-6.3.5.9.ebuild 3037 RMD160 71e25a9e117aa9057b019c85bdaf3313c1
 MD5 f504d96a7ed5ade55d0cf362dbf8ae17 imagemagick-6.3.5.9.ebuild 3037
 RMD160 71e25a9e117aa9057b019c85bdaf3313c1b3eb52 imagemagick-6.3.5.9.ebuild 3037
 SHA256 273e62d7437ff287a33ca8d6a6209089158c0d7b14b70b69d2b5a3f60ee38f78 imagemagick-6.3.5.9.ebuild 3037
-EBUILD imagemagick-6.3.7.9.ebuild 3241 RMD160 bb27a5a7b0a3387879303332569d646667a04da0 SHA1 86a5bc6954f82b5399a434154a342aaf42b1b1fd SHA256 6248602e0b08771083eb31ac3e47bd89eb9b7e1e365ed9323d79750c68b004b4
-MD5 69070861c7ecbae8607fef9d8aa6b1a5 imagemagick-6.3.7.9.ebuild 3241
-RMD160 bb27a5a7b0a3387879303332569d646667a04da0 imagemagick-6.3.7.9.ebuild 3241
-SHA256 6248602e0b08771083eb31ac3e47bd89eb9b7e1e365ed9323d79750c68b004b4 imagemagick-6.3.7.9.ebuild 3241
-MISC ChangeLog 38783 RMD160 6ae8cbdd02345f9f17ae64142758322b7fb47948 SHA1 c4a9cc7b90cba2f466aeb74f39819d577e5e5611 SHA256 fc151e654880333b0ea217e265bc950cf0e9c92711d6ce9de57fba9bebaee1ae
-MD5 1a6d81664768b87996a741343e74366b ChangeLog 38783
-RMD160 6ae8cbdd02345f9f17ae64142758322b7fb47948 ChangeLog 38783
-SHA256 fc151e654880333b0ea217e265bc950cf0e9c92711d6ce9de57fba9bebaee1ae ChangeLog 38783
+EBUILD imagemagick-6.3.7.9.ebuild 3249 RMD160 95d38d3de950f3bfec2c695d747a007b20f761b5 SHA1 c886c7d7276785410a96069b5732a77677e4fca8 SHA256 a69a75acbf36ba856bc347b0d26ca05a8925fb679d119baf3705896988789a1c
+MD5 3ad3455d4e993c2650609b65f33deb53 imagemagick-6.3.7.9.ebuild 3249
+RMD160 95d38d3de950f3bfec2c695d747a007b20f761b5 imagemagick-6.3.7.9.ebuild 3249
+SHA256 a69a75acbf36ba856bc347b0d26ca05a8925fb679d119baf3705896988789a1c imagemagick-6.3.7.9.ebuild 3249
+MISC ChangeLog 38983 RMD160 2b353babfc6791e742aa7f1d05692be60aa5a7f5 SHA1 47783326305801753088fa625eba69a1485ec3ea SHA256 35aa4b4265e7f814f9e51dde204c7ea029897012b340215cf3173bc5afb27595
+MD5 12d9065cb1988e4dfe1161b81d1f78c3 ChangeLog 38983
+RMD160 2b353babfc6791e742aa7f1d05692be60aa5a7f5 ChangeLog 38983
+SHA256 35aa4b4265e7f814f9e51dde204c7ea029897012b340215cf3173bc5afb27595 ChangeLog 38983
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -97,9 +97,9 @@ MD5 d82ddf0123cf51d96c82e40824e89c87 files/digest-imagemagick-6.3.7.9 265
 RMD160 0bbccc1633f8f4b01f488dabc60356cd586d199d files/digest-imagemagick-6.3.7.9 265
 SHA256 fba8220e608058d6494980e1765c99831db1b99fe3a9e440b6d753eae72ab152 files/digest-imagemagick-6.3.7.9 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeCsc0ACgkQkKaRLQcq0GIcVQCgmrrwpu8d2jCtLC49Horl6eKm
-cncAoJK0vqYRMs61YkX6UzXdmj5JzviX
-=bupJ
+iD8DBQFHiMvykKaRLQcq0GIRAkP7AJ4hBMdNXFyKZAi94ghgMs3Z1x4JjgCgnzX0
+PJpq9ve7QFpAG//Kq6tG3UU=
+=pI0M
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild b/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
index db564403970b..dba937368e16 100644
--- a/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild,v 1.2 2008/01/07 23:10:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.7.9.ebuild,v 1.3 2008/01/12 14:16:09 maekke Exp $
 
 inherit eutils multilib perl-app
 
@@ -15,11 +15,12 @@ SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
 LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 djvu doc fpx graphviz gs hdri jbig jpeg jpeg2k lcms mpeg nocxx openexr
-	perl png q8 q32 svg tiff truetype X wmf xml zlib"
+IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx
+	openexr perl png q8 q32 svg tiff truetype X wmf xml zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	djvu? ( app-text/djvu )
+	fontconfig? ( media-libs/fontconfig )
 	fpx? ( media-libs/libfpx )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
 	gs? ( virtual/ghostscript )
@@ -27,7 +28,6 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	jpeg2k? ( media-libs/jasper )
 	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
 	png? ( media-libs/libpng )
@@ -81,6 +81,7 @@ src_compile() {
 		$(use_with !nocxx magick-plus-plus) \
 		$(use_with bzip2 bzlib) \
 		$(use_with djvu) \
+		$(use_with fontconfig) \
 		$(use_with fpx) \
 		$(use_with gs dps) \
 		$(use_with gs gslib) \
@@ -89,11 +90,10 @@ src_compile() {
 		$(use_with jpeg jpeg) \
 		$(use_with jpeg2k jp2) \
 		$(use_with lcms) \
-		$(use_with mpeg mpeg2) \
 		$(use_with png) \
 		$(use_with svg rsvg) \
 		$(use_with tiff) \
-		$(use_with truetype ttf) \
+		$(use_with truetype freetype) \
 		$(use_with wmf) \
 		$(use_with xml) \
 		$(use_with zlib) \