Fix cross-compiling with freetype while upstream sorts it out.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 61 insertions, 21 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e42e953f3ad4..0223f6c8a0a6 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.497 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.498 2013/01/21 05:18:23 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/imagemagick-6.7.8.7-freetype.patch, imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Fix cross-compiling with freetype while upstream sorts it out.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.8.7.ebuild,
   imagemagick-6.7.9.9.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 872ff13305a2..6b89d4f958b1 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX imagemagick-6.7.8.7-freetype.patch 1114 SHA256 fcdb9382eddab0ae73f115178296933b1c8705719b2c3c43ce8274441a4387e7 SHA512 86372988ab4ee7be8573d50f7dd5022f031cfdf1e3e6e478c99d155e9cbc251a0db7496c141931e2b08d3e5142169ef56b544b70449dc41cf3376ddaf99e8ec1 WHIRLPOOL 9eb6105540e49b35e13e4ae7863a8fb20bd7bd292c93bc29c4e9c6914b0fb92496b736276a5c7f926a2a1b755547b2ced6471e929d0ce95ff3a6aa81c91aba62
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 DIST ImageMagick-6.7.9-9.tar.xz 8363720 SHA256 706164aa20219f2f72bed9f8f2d1a998897fed61cd95cd4939be4e8fa7e1904a SHA512 41070032e7deddba17a779a985d600526c0eb32a5518db5d11aa722a65998743344105825155606dc2aab8af45ffa585f2c34e55f492662998773c1d84f880f9 WHIRLPOOL 09428d51460276d558e0c7c2bcd50b765865b59a2b243bae6f82b363c469599c2fb190d41a55d990b0474e2d9417acfb24506e3802a528ec84ab43d9283b5705
-EBUILD imagemagick-6.7.8.7.ebuild 4191 SHA256 7c0775fce1fb3f4073b2617dd9788d5c5b90f520855ddfc6d877fd296514c5f2 SHA512 9b0cc29140ea16278467ad021f11896a255cad3df73dd9ce823354ca8bde74b736b56ee3e3ca3e2893e6dd059a9a0502f24c0fb1b7835850fadbc0a29b9ae3dd WHIRLPOOL ac82924a9d84397faab207f406d555b00f2a0d29b5f613031e7c3eb2c93455fbc1ae52a3d51c709ca0e40c59c17375b4f8198dc1ffc4f9a9f894b446a295793c
-EBUILD imagemagick-6.7.9.9.ebuild 4343 SHA256 6ec0d781dd8808cf6ac17d03650766ff0fbe315f4604bcb9bfb059a51b86724c SHA512 5f10558e7746347443933fcf234a9228e82d4721033220d0ea30786474ef21d5e4d2b452356b5ab0a69829664761bfa079b010e8f4a7a1a7dbfd5b001df267d6 WHIRLPOOL a630e760b2880f7dd702a6f24038401807f74678a32c3685a10993a47a9473820f5024b7427a502260703b39a34ab3432afd5a7bcc547a60d9abb796ad08b0b6
-MISC ChangeLog 73493 SHA256 6bfc551e12451b61a94802a1bcdf5bf6fd1423eef0215beb96bee0ff3b0b913b SHA512 ebfcb38e1d4f0a6a1ff613af36eddd615d94cef62f9680c7bc142975537827917170c211dd1ceeeea0739ae33111d508d319135014e4c2f6ae2a1d3fc606780e WHIRLPOOL a45b65810860e2c59dbbc9e76c07a23887e7ca43a0cddf4966b531ae128064b5e01056a24ab5cb878e5a898fd42e0df51b24404869023dfb9368ee4c1cbe4ded
+EBUILD imagemagick-6.7.8.7.ebuild 4250 SHA256 bb3fac1b6fdb01a6cd9b906647db716c1fba4f70d026859d09dd362bcf6c0b80 SHA512 51034dafd444cca8050b85a3be17e7b92f79b942d2ed06334bea93ea740af5ccc2539960f775d3eda140b6c1ae978ab0c233c5b236765a04a47883444d54d59a WHIRLPOOL 0fe26134dc45c1089a1121ebfab0091f783b31bbb7dc33925dd0fdff6bca7e85ed9067da9785c6bc62aceb2138d7768dccd53892e4af3d111b0cf7d441ef789f
+EBUILD imagemagick-6.7.9.9.ebuild 4401 SHA256 f79e633d7473ad84cc2158f03debffa86a2017768e6828e3f75610bba12161e3 SHA512 e489668105b73a0ef375f3342a259a0e559acff4105ad3b28f7b21037031bbcd685feca0dd35ba2eed42f6f45d6c2800f7174300b3073b72e4bbabe7e7f6edca WHIRLPOOL 91d92d9624f6faff6a3944da7358b7dda9a68c00c9bfd1a4dae64f4b4c5c74bccf7b3c1920a34f6f81599f7124b36d1603c51204f17942a15083cb3b5e61fa55
+MISC ChangeLog 73712 SHA256 d8d4c11700d3eb56ec094f00d4ef5827886840dc309dcd9e1d4ed4a612b8a3f7 SHA512 b638c750a7fcaae9d88d1474f757a551d997e18b95087244762d33747c49bd780f10d3cb1d487604e4b2cd065147fc618dbe397f0b4f4e43a48927a622d787be WHIRLPOOL a92fd9716d20eeae972b9c701644b75429114ba20efa4ca4dfec5506d1387348ad1573d84a17ae9d400ab699fb84795729fe0b1e3a0b1c2dce940f008fee3663
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/LopAAoJELEHsLL7fEFW7GsP/1Q4f5ie4n91NzftS2DlKNRA
-IZSODtopzNuT9VSmfBwQYY5OV4wyRdZByt3mbijiJTDEjvpmlaTDHPzE9eSyrN3a
-4ln/N9MUiH+4ByPVjOxwlMyS71qPm0v3RYsuOC5Q5HE8urPcg07UcfpplyLv2wuy
-zmu1PLoy40HE8ABtyPoBAsGphv2olCGG6aHhpQZ3GJ0uCCmy8RV1gF2g23iE7Ltu
-7qMDuElSC9zhorTpJLQh8WLTwzyZsrWnAu3lFeUNWEr39LBZVZqWmY9J4DnhpRe9
-7kFE1ar91zvnzjC/yji4R2dyIqemiPWgJpn2ZrCmcxcR92/CE51V8OYG6LL957Jn
-EaqK6zAeuJjgnbTbYYzVvr/m1ZvgtQi7+ekUwxWaFJjx+j6gsx0Pl3Xs1djupbek
-HUggF563H7KtkIRZUuzH7pQtKOU8xwg28qVGRhtH6D9B+wPw2nVvj2K/Qkqkzip3
-FnlgJIRC4eO15kOxOa/E74mSlH5F9mAOAu2jK2Av3w1XyuWQsp91+fWBYprCLqZ6
-0vnObkLDhzK9ekG8cfGnX9TckTUv0eIb4blfeTukSINpb8gm3mC703W6F78QONCf
-viSYXblwJNo4bzZO7msJhl6+UUHVh9jzdLwU60v5Yq9ao3wtRvUTEceaiF9FlE80
-gcK0YJOWXj8Mktusq1gC
-=App1
+iQIcBAEBCAAGBQJQ/NCPAAoJELEHsLL7fEFW6T4P/1KI2BxaRrFZgmweLzR+/RbK
+TaF4ZpWZHIu19h7PUKZlc1JM+X0Z4r8OvqatbP+TZ4tKdAlf/cauZpdkQz8qUEJr
+9f/Wyon/IwQlTgYP78XUI1ONHu5PnE6u778AkqRXdTNobrd9NI/6FRrk5DNBw6H3
+5n2AE+lgC1rPoqU1NO20NUp81+Nf5b6MByEhC7kpOF4WI+p+Axc+Bk6ZKUFRJI5I
+0Z31zGSXLz0l3E97xBRrNS0FMteoioHeRiqbE/daUVLj9shcjCcU7Y7lWS3sB/Kc
+Um7oP5CCHoqnin+lE+gFwXdnzXlFo8bTCwAr0593Ox2LHLuRul+JL6LysNnu+RpS
+RgbZg1Hv0Il8goH3JAt9vdevs2Y+8dU1QOdAVUQX10SystidIryPUvEuf4ZY66V7
+dFi2L1nNBkTVWVq63sAKQPubDCKW0BLDslSzcEpDbVBxmICYDzlAxUeO34QmY0n0
+4CRDatUziC+7X/xhS6DjD4pIf1KGxLpd7wPnGsm1/KZQUWTLNDMCo47mASnmUyMH
+0Sd1d7bS69Fd5VGGcMzenpJjFoeA9M9eyhRO82ZRFWOe7yLFGxEXTINAjZJR2W4p
+R6dCo2wvibRnVEsLbQ+kw7JxtDpKUX6oA90FIekWWIU6arLu+xAcri/L4MxcVcNb
+5ncK6vjtB1rnZ2/9OXyI
+=Ag8l
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch
new file mode 100644
index 000000000000..ce1332f335a2
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch
@@ -0,0 +1,32 @@
+https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
+
+--- a/configure
++++ b/configure
+@@ -26488,7 +26488,6 @@
+ 
+ # Assume that delegate headers reside under same directory as ImageMagick
+ # installation prefix.
+-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
+ 
+ #
+ # Find the X11 RGB database
+@@ -29490,8 +29490,8 @@
+     then
+       freetype_prefix=`${freetype_config} --prefix`
+       freetype_exec_prefix=`${freetype_config} --exec-prefix`
+-      LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
+-      CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
++      LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
++      CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
+     fi
+ 
+ dnl First see if there is a library
+@@ -35767,7 +35767,7 @@
+ MAGICK_CXXFLAGS="$CXXFLAGS"
+ MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
+ MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
+-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_LDFLAGS="$LDFLAGS"
+ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+ 
+ 
diff --git a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
index cf434ccdde26..7161b3cfbc8e 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.9 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.10 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }
 
diff --git a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
index aa883bc7a078..45ba7608d8ad 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.2 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.3 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }