Update freetype cross-compile patch to drop eautoreconf usage (fixes bug #465122).

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 14 insertions, 10 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 65a850746e41..1a1a1e1789fe 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.110 2013/04/08 03:52:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.111 2013/04/08 17:41:50 radhermit Exp $
+
+  08 Apr 2013; Tim Harder <radhermit@gentoo.org> graphicsmagick-1.3.18.ebuild,
+  files/graphicsmagick-1.3.18-freetype.patch:
+  Update freetype cross-compile patch to drop eautoreconf usage (fixes bug
+  #465122).
 
 *graphicsmagick-1.3.18 (08 Apr 2013)
 
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch
index e8b7aaa16360..d6504e6d0ffe 100644
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch
@@ -1,8 +1,8 @@
 https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
 
---- GraphicsMagick-1.3.18/configure.ac
-+++ GraphicsMagick-1.3.18/configure.ac
-@@ -1305,7 +1305,6 @@
+--- GraphicsMagick-1.3.18/configure
++++ GraphicsMagick-1.3.18/configure
+@@ -22249,7 +22249,6 @@
  # directory as GraphicsMagick installation prefix.
  #LDFLAGS="$LDFLAGS -L$LIB_DIR"
  #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
@@ -10,7 +10,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537
  
  #
  # Find the X11 RGB database
-@@ -2273,8 +2272,8 @@
+@@ -25994,8 +25993,8 @@
      then
        freetype_prefix=`${freetype_config} --prefix`
        freetype_exec_prefix=`${freetype_config} --exec-prefix`
@@ -20,8 +20,8 @@ https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537
 +      CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
      fi
  
- dnl First see if there is a library
-@@ -3354,7 +3353,7 @@
+     if test "$LIB_TTF" = ''
+@@ -29605,7 +29604,7 @@
  
  MAGICK_API_CFLAGS=$CFLAGS
  MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
index af06f0ca123b..169b1050721e 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.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/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.1 2013/04/08 03:52:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.2 2013/04/08 17:41:50 radhermit Exp $
 
 EAPI=5
-inherit toolchain-funcs eutils autotools
+inherit toolchain-funcs eutils
 
 MY_P=${P/graphicsm/GraphicsM}
 
@@ -46,7 +46,6 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.3.18-freetype.patch
-	eautoreconf
 }
 
 src_configure() {