Make corefonts dependency conditional based on USE=truetype, bug #146713

(Portage version: 2.1.2-r9)

4 files changed, 33 insertions, 46 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e18b4c2325e5..f9bc81a83cbe 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.211 2007/02/07 20:23:57 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.212 2007/02/08 16:01:46 dsd Exp $
+
+  08 Feb 2007; Daniel Drake <dsd@gentoo.org>
+  -files/imagemagick-6.2.5.4-docs.patch,
+  +files/imagemagick-6.3.0.5-configure-windows-fonts.patch,
+  imagemagick-6.3.0.5.ebuild:
+  Make corefonts dependency conditional based on USE=truetype, bug #146713
 
   07 Feb 2007; Karol Wojtaszek <sekretarz@gentoo.org>
   -imagemagick-6.2.9.5.ebuild, -imagemagick-6.2.9.5-r1.ebuild:
diff --git a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
deleted file mode 100644
index 9a28d80197ca..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Better control what doc files we install and where
-
---- configure
-+++ configure
-@@ -45956,7 +45956,11 @@
- 
- #
- # Path to ImageMagick document files
-+if test "x${PF}" = "x" ; then
- MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+else
-+MagickDocumentSubdir="${PF}"
-+fi
--MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
-+MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html"
- MagickDocumentPathDefine="${MagickDocumentPath}/"
- if test "$native_win32_build" = 'yes'
---- Makefile.in
-+++ Makefile.in
-@@ -4532,10 +4532,7 @@
- 
- # Architecture independent data files installed in the package's data directory
- docdir = $(MagickSharePath)
--doc_DATA = \
--	LICENSE \
--	ChangeLog \
--	NEWS
-+doc_DATA = 
- 
- @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version # $(TXT2HTML_TARGETS)
- 
-@@ -4547,7 +4544,7 @@
- #
- 
- # Install HTML files
--pkgdocdir = $(MagickDocumentPath)
-+pkgdocdir = $(MagickDocumentPath)/html
- DOCDIRS = images www www/api www/Magick++
- HTML_INSTALL_DATA_TARGETS = install-data-html
- 
diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch
new file mode 100644
index 000000000000..0857d866dfb8
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch
@@ -0,0 +1,19 @@
+
+From: Daniel Drake <d.drake@mmm.com>
+
+Handle --without-windows-font-dir as equivalent to --with-windows-font-dir=
+
+Index: ImageMagick-6.3.0/configure
+===================================================================
+--- ImageMagick-6.3.0.orig/configure
++++ ImageMagick-6.3.0/configure
+@@ -20544,6 +20544,9 @@ else
+   with_windows_font_dir=''
+ fi
+ 
++if test "x$with_windows_font_dir" = "xno"; then
++  with_windows_font_dir=
++fi
+ if test "$with_windows_font_dir" != '' ; then
+   DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir==$with_windows_font_dir "
+ fi
diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
index 23d440298c92..f81e20d1e844 100644
--- a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.9 2006/11/27 00:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.10 2007/02/08 16:01:46 dsd Exp $
 
 inherit eutils multilib perl-app
 
@@ -19,7 +19,6 @@ IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff t
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )
-	media-fonts/corefonts
 	X? (
 		x11-libs/libXext
 		x11-libs/libXt
@@ -32,7 +31,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xml? ( >=dev-libs/libxml2-2.4.10 )
-	truetype? ( =media-libs/freetype-2* )
+	truetype? ( =media-libs/freetype-2* media-fonts/corefonts )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( >=media-libs/jpeg-6b )
@@ -56,6 +55,9 @@ src_unpack() {
 	einfo ${S}
 	epatch "${FILESDIR}"/${PN}-6.3.0.5-docs.patch
 #	epatch "${FILESDIR}"/imagemagick-perl.patch
+
+	# from bug #146713, sent upstream
+	epatch "${FILESDIR}"/${P}-configure-windows-fonts.patch
 }
 
 src_compile() {
@@ -64,7 +66,7 @@ src_compile() {
 		--with-modules \
 		$(use_with perl) \
 		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		--with-windows-font-dir=/usr/share/fonts/corefonts \
+		$(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \
 		$(use_with !nocxx magick-plus-plus) \
 		$(use_with bzip2 bzlib) \
 		$(use_with fpx) \