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

4 files changed, 61 insertions, 15 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index bb9da00ce0af..83e572cea458 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphicsmagick
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.108 2012/10/15 06:03:16 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.109 2013/01/21 05:18:13 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/graphicsmagick-1.3.17-freetype.patch, graphicsmagick-1.3.17.ebuild:
+  Fix cross-compiling with freetype while upstream sorts it out.
 
 *graphicsmagick-1.3.17 (15 Oct 2012)
 
@@ -341,4 +345,3 @@
   02 Aug 2008; Janne Rönkkö (jroo) <jroo@iki.fi>
   +graphicsmagick-1.2.5.ebuild, +metadata.xml:
   New Ebuild for bug 190372.
-
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index e1020cd22768..d593f49672d4 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA256
 
 AUX graphicsmagick-1.3.16-libpng14.patch 2540 SHA256 1c0db66018035a13fbfa2d61d3a71534350e52809e67888f07113663b82bf4c6 SHA512 aab31f92a3b41b60e42afd8d222c16a64d1a602e66b8f61efbadddc09a95aa32d9a5a20f535c784ffd58978da7b5f9580c85ee061e49b043e9dff8fb7a015379 WHIRLPOOL ce849fe5293714ea227c9620165431df97b7a3c51a94f8259617ccbddafa6dfb5268f30416258abaff1a5cd54b27aaf01c2b57b0d816c660d2aaab16946387fc
+AUX graphicsmagick-1.3.17-freetype.patch 1152 SHA256 be7a5b150c1962f843ffeec17fb623e2a8a8a340697f9c5b627280cbe1a3a885 SHA512 771fe683c0f672d5ee559abd796b8b29a24969717c43ee859675bcbd1e8bd9a1755236cc1862b43c61a4708e27c853b2dc91db64bf6e4e276aaa669ad4180b88 WHIRLPOOL 4c150994bae88f924e739cb33522d6c22428204a49540eff28636eb59d230beac1b50fe6f826c4ba45031d176b817e8d26ce51f32ef8a6f8464957f48e7e9a4a
 DIST GraphicsMagick-1.3.16.tar.xz 5550004 SHA256 df8ca4d79c0071662cdf125d08581a2c55910f9c5c3e2b885dd05271559dd4b0 SHA512 24f94cbfa5e92897973a51ce5ee231733483ab04b271432999a2485a2e4355c5b3bcd8017dbfd1fcdd3e4798750caba28e8e67cf533f367ac3f5f03867f620bc WHIRLPOOL 49b33ce9ffb438bd4a1445973e8f7a7724c1d6588dd6adefbe68a7ca4ed8c500e3a44695e0bc0a2744c8cb2ee714cb5aa5f0b6d2d90da1d252c2536dc39879be
 DIST GraphicsMagick-1.3.17.tar.xz 5403300 SHA256 25a80cb86ff9ba3d11972120be3f6c70c6c12168d2ef95c6f30899db3d74cc36 SHA512 8de9f886b9dd48e0337d00dddc42d954dd851d4c1a924c0a81ac98f569c3f047f438b71a5c8ebbd9bd8effd6b12911fbeeb0bc8d7c3c562c94c8919ca01a97bf WHIRLPOOL 718718f5c788c614450a68881ffbd506b5be0478b8d166075a635e9814c920012ceef96ccb5513559d0eb0a4564cf6e9f46bf72884404f9b0c7b4bfb08ca8af3
 EBUILD graphicsmagick-1.3.16-r1.ebuild 3169 SHA256 9771f7ae8bf48dc18ba5ccd8080ec9316e89fb499461a060709f86b8a20530c0 SHA512 b2ab63f287bcdf4f4a4b41c807658ebac68cd7c133d0009c5fd6e0864646191d1df77505c75a660cc7ccd39b2944825305957d15a696bd0ee72a9b2c5ba86994 WHIRLPOOL 6758a2a6da77060e714e1b1edc87f91bdc4844eed8ad93a5618ecea23fe162d5ba27b33814a1e4cb271033dfde25882f0129be98cd8a872e9171c5c2ba8c545d
-EBUILD graphicsmagick-1.3.17.ebuild 3043 SHA256 3477c789f8e1622d717afd8173bce70357dc04c10dac7721c7541753229f54d8 SHA512 b0ca16a6cc96b737804678386f08cdf76933663e25621effeb1029babd8250384d88118d85a0196da5f172947cf9a8dfb2cafaad857a8a244c76c767ffaac450 WHIRLPOOL e86903eaa5222a28886822bda83b10113a5b01ed25ef2c89e5575daa83c40e9b953a94501056c2705e73d47f2aca05693eab29d95bdd6c2297bc88da94bed599
-MISC ChangeLog 11738 SHA256 3c05c0766a42b49c2a77e4b33989dada8937c9e5be3d49338343fb170413bfa5 SHA512 a90ca0b79d8ffc41b1ccf6738af1a065bc3ebfb0f48b2c0ce7590dcd2e3b837bddb70f74e372c5ce0caf36e67b06e5e50640b2c73253072b7ddfdb90fe87e382 WHIRLPOOL 8543b1b3e3f6332f2fedeee8dc28f87bdafa29b54cc52986ed7b3f58fb16584d879635db3fbc82657e24f017bd8af9cc69ee816daef2aa7341c61d2d0bfb7970
+EBUILD graphicsmagick-1.3.17.ebuild 3116 SHA256 b9ca412e1dcbb149394c9a250e2c72dbd99f1af5f1c2973bf4641727bb904ba6 SHA512 c6e171fd0ef825e9d220beb168a5a087aa1a038787b1a12a4d1d57a597f38e617fc8d9586d957f26e445d091d7f15befdbd4c6f82b2827f451f801e7837ec0e4 WHIRLPOOL 5e6df5d1d74f1b5c692b6b5c0b8c984050f8f72b19ff5279c7f8901cf9b682902acb8fa5ff9661afb0e643121b5663b8a6ab97e4d35531dec6f6310648c186a6
+MISC ChangeLog 11927 SHA256 0d71dfd009d1baa796970798c3f9ef97f29610714d075f82a348c8f7a0c8abdb SHA512 20209524a3ac564a11f114cbe5d6700d0eee3c41d26d0618c3f6a3bfa190e010b4783f0e85dbe91a39df021085fca920d04fd22e941eb176a00bcfc66426ba75 WHIRLPOOL 021ec661cadee8a51fbcbde79be6b64cbe84ea3db1173bca32534bb2b04bc88a222007ef8e5334260df9da14939a72267f31f660b512d948cb5faa7ffd449a27
 MISC metadata.xml 948 SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6 SHA512 bd1485172b469c218f688d3352c5a00f16f651a3aedbc1db786aa524b6e7c1c237cce556a17d223c29ccff870601691ae7a0f54d01005c3541a3c67526ae65ee WHIRLPOOL 7f33793cca1f96fb4d65c8d1da2ea14901ed6614ff99655bad14e71963ecd0f3fdb6c216e8df301a6e462d04e3461031f0874e58b2b94d9271f659df902285dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQe6clAAoJEEqz6FtPBkyjI+oH/iu9OOhJ1H7dCCiuU0PHMS6M
-m2RWcDR48vhv0QXZm8DxrnD4YFVKQG0tKjRAHWT/Z+F2VfymbJNBo0sPoq1TuzPE
-OSIWb2DpkGtf4k9nxyfqHuwZzckoCRu8K2zQe+DedPMSht+UI5f3KBWNvuP6ximN
-t7SGqfptqlLTWZf7j03nfyXWpvAj3lPyssCowahoeZx2lELHAfv1VEZYdBBWZ/B0
-F1tlhxLpHs7jF0E0twFODEM6G1NIh1fBE9nQyhoxO6rd5EDW04h/uYrIkHj6jYf6
-y0SgXxbWlOhQksyV37AJwZSVdkRb8XbZCyKySGyps1x+IjOfHblyV2DIAeGfv9o=
-=ZjcY
+iQIcBAEBCAAGBQJQ/NCEAAoJELEHsLL7fEFWO5kP+wXZC3omeEoLwLVCk4sa5DdU
+/WcbFeZCNBQpktFO2Cdz+uKRBAVMg0bV8F+RjHfzRL3mlLim7iC7gkequ4LREc3Z
+n/A5bKepcN8IcF1LWXt+fW8t4/gj36ITyiQxsQ5vstxEhvCvXmrQ9Y/BWhXLylsp
+OL2z90/+qwZIJ6uqGOD2r8ast6SmHcoZWQTXJo5zSCa9fqBPjCMu6G4gpBFxZ5jW
+V2/Q3F5GkjrRDDRr0eBkrDEyFUeukU8INRBxOHvlnvE5VVr0FHlmgBxetCCKy3PW
+0+GrTpuwugDPUZmlrTfz7YvoqtvINoI5S1GkUUXKkBBEMERVYbhsKpuiJv94kdgd
+EXaQ+e+NNK/8VUvW4Rn+A1IB3z7COvFuYZw6DxMYQO552NHy5Rw2Wv/7QLtfzkUQ
+nMp/kUtibqNA/EcuZ6jA78BjTuj1essU0JKDT3SKOn0F/5tnqPZhFn3FDUGecyyZ
+RzupTcFVjZmNlqgbkxw7OWy/gD9bY7lmnbMrcFC2PiLnFi7tMoZUx5pJ+1UpvO5t
+g6IpGncB2ii+W1ote6zXHdE1kwMk/GJgeJzZnctLQgXKby92rPFGwEiosHxHUSan
+zlwqk4fV6BYR1/nDF9d1KQYghUMQ9yzogzv4fIEOCPqcC1cFLXTe2fHgpgqI/sqz
+Ty1Lr0LF3RLUc+o6j+a0
+=ilTr
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch
new file mode 100644
index 000000000000..3ae4ad49f00b
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-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 @@
+ # directory as GraphicsMagick installation prefix.
+ #LDFLAGS="$LDFLAGS -L$LIB_DIR"
+ #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
+-MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_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_API_CFLAGS=$CFLAGS
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_LDFLAGS="$LDFLAGS"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
+ 
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild
index 9fc6c935525b..8df3ddaefb48 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild,v 1.1 2012/10/15 06:03:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.17.ebuild,v 1.2 2013/01/21 05:18:13 vapier Exp $
 
 EAPI=5
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 MY_P=${P/graphicsm/GraphicsM}
 
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.17-freetype.patch
+}
+
 src_configure() {
 	local depth=8
 	use q16 && depth=16