Added patch to fix compilation issues with imagemagick-6.3.9* (see bug #214040).

(Portage version: 2.1.4.4)

4 files changed, 40 insertions, 7 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 4856437e39a0..883c8caf2865 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.4 2007/11/05 11:54:54 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.5 2008/03/21 20:43:56 markusle Exp $
+
+  21 Mar 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/gdl-0.9_pre6-magick.patch, gdl-0.9_pre5.ebuild,
+  gdl-0.9_pre6.ebuild:
+  Added patch to fix compilation issues with imagemagick-6.3.9* 
+  (see bug #214040).
 
 *gdl-0.9_pre6 (05 Nov 2007)
 
diff --git a/dev-lang/gdl/files/gdl-0.9_pre6-magick.patch b/dev-lang/gdl/files/gdl-0.9_pre6-magick.patch
new file mode 100644
index 000000000000..ec22bdef825b
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_pre6-magick.patch
@@ -0,0 +1,26 @@
+diff -Naur gdl-0.9pre6/configure gdl-0.9pre6.new/configure
+--- gdl-0.9pre6/configure	2007-10-29 19:27:12.000000000 -0400
++++ gdl-0.9pre6.new/configure	2008-03-21 15:43:20.000000000 -0400
+@@ -19666,11 +19666,11 @@
+ 
+ if test "x$with_Magick" != "xno"; then
+   if test "x$with_Magick" != "xyes"; then
+-    LIBS="$LIBS -L$with_Magick/lib -lMagick++"
++    LIBS="$LIBS $(Magick++-config --libs)"
+     INCLUDES="$INCLUDES -I$with_Magick/include"
+   else
+     LIBS="$LIBS -lMagick++"
+-    INCLUDES="$INCLUDES -I/usr/include/magick"
++    INCLUDES="$INCLUDES $(Magick++-config --cppflags)"
+   fi
+ 
+   echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick" >&5
+@@ -19679,7 +19679,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lMagick  $LIBS"
++LIBS="$(Magick++-config --libs)  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/dev-lang/gdl/gdl-0.9_pre5.ebuild b/dev-lang/gdl/gdl-0.9_pre5.ebuild
index b6985c475607..ff1a83d6cceb 100644
--- a/dev-lang/gdl/gdl-0.9_pre5.ebuild
+++ b/dev-lang/gdl/gdl-0.9_pre5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre5.ebuild,v 1.1 2007/08/21 08:58:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre5.ebuild,v 1.2 2008/03/21 20:43:56 markusle Exp $
 
 inherit eutils flag-o-matic
 
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 src_test() {
-	cd ${S}/testsuite
+	cd "${S}"/testsuite
 	PATH=${S}/src gdl <<EOF
 test_suite
 EOF
diff --git a/dev-lang/gdl/gdl-0.9_pre6.ebuild b/dev-lang/gdl/gdl-0.9_pre6.ebuild
index 8d1f4ae349cb..01cb0a94e182 100644
--- a/dev-lang/gdl/gdl-0.9_pre6.ebuild
+++ b/dev-lang/gdl/gdl-0.9_pre6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre6.ebuild,v 1.1 2007/11/05 11:54:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre6.ebuild,v 1.2 2008/03/21 20:43:56 markusle Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,6 +36,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-proj4.patch
+	epatch "${FILESDIR}"/${P}-magick.patch
 }
 
 src_compile() {