Now autotrace can be compiled with imagemagick-6* support, bug #69969

diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 48ec41b7f2247b26462b7cc501e2c55c45829b5d..d97bc1f28033874345a587ee63fa6d974981f1e7 100644 (file)
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/autotrace
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.14 2004/08/28 15:16:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.15 2004/11/07 12:08:52 sekretarz Exp $
+
+  07 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/autotrace-imagemagick.patch, autotrace-0.31.1-r1.ebuild:
+  Now autotrace can be compiled with imagemagick-6* support, bug #69969
 
   29 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> autotrace-0.31.1-r1.ebuild:
   Stable on ppc to support fontforge.

diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index 37e9eec4fb808d268e800fc3952567ad5cf33671..d2628e34544099f3f00ee7d34a59ff1aa79175c9 100644 (file)
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 de971386e5c55cd3c15604b8dd894cc5 autotrace-0.31.1.ebuild 670
-MD5 66b4a0c74ecd7bed26720ac57900974a autotrace-0.31.1-r1.ebuild 937
-MD5 537c304eae200be79d07bd2b00d80013 ChangeLog 1682
+MD5 a82756d0b1bf31a7c93f7856f781a18e autotrace-0.31.1-r1.ebuild 1054
+MD5 7ccf93cf8f8488205cea16ef5336c4a0 ChangeLog 1879
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 f142e4322a72c3246f11a99b53e2d702 files/digest-autotrace-0.31.1-r1 68
+MD5 e5551f2f94c0ff55ce8a6394e574dcc5 files/autotrace-imagemagick.patch 962
 MD5 f142e4322a72c3246f11a99b53e2d702 files/digest-autotrace-0.31.1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjhBjZ/iYVBmujdURAlalAJ9pYAjyZiRGPBUYVFdbt5g/iNGvxwCg/BDJ
+5Dybr8JoaqdbB5q50YSC0zw=
+=vbdE
+-----END PGP SIGNATURE-----

diff --git a/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
index 2a7567968c1beaf4ab0c899107f4a4abe418158b..94091c3cdcad8d946f6d39e0253970b4664d8216 100644 (file)
--- a/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
+++ b/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild,v 1.11 2004/08/28 15:16:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild,v 1.12 2004/11/07 12:08:52 sekretarz Exp $
+
+inherit eutils
 
 IUSE="png flash imagemagick"
 
@@ -20,6 +22,14 @@ DEPEND=">=x11-libs/gtkDPS-0.3.3
        flash? ( >=media-libs/ming-0.2a )
        imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/${PN}-imagemagick.patch
+       autoreconf
+}
+
 src_compile() {
        local myconf=""
        use imagemagick || myconf="--without-magick"

diff --git a/media-gfx/autotrace/files/autotrace-imagemagick.patch b/media-gfx/autotrace/files/autotrace-imagemagick.patch
new file mode 100644 (file)
index 0000000..bd33f26
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-imagemagick.patch
@@ -0,0 +1,17 @@
+diff -Naur autotrace-0.31.1.orig/configure.in autotrace-0.31.1/configure.in
+--- autotrace-0.31.1.orig/configure.in 2002-11-08 18:49:23.000000000 +0100
++++ autotrace-0.31.1/configure.in      2004-11-07 12:59:31.750331496 +0100
+@@ -79,11 +79,11 @@
+                       | sed -e 's/^[0-9]*.[0-9]*.\([0-9]*\)$/\1/'`
+                       changequote([,])dnl
+                       MAGICK_MAJOR_VERSION_CHECK=`expr $MAGICK_MAJOR_VERSION \>= 5`
+-                      MAGICK_MINOR_VERSION_CHECK=`expr $MAGICK_MINOR_VERSION \>= 2`
++                      MAGICK_MINOR_VERSION_CHECK=`expr $MAGICK_MINOR_VERSION \<= 2`
+                       dnl I don't consider ImageMagick 6.x.
+                       if test "$MAGICK_VERSION" = "5.2.0" \
+                          || test "$MAGICK_MAJOR_VERSION_CHECK" = 0 \
+-                         || test "$MAGICK_MINOR_VERSION_CHECK" = 0 ; then
++                         && test "$MAGICK_MINOR_VERSION_CHECK" = 0 ; then
+                          AC_MSG_RESULT(no($MAGICK_VERSION))
+                          AC_MSG_WARN([*** Version 5.2.1 or higher is required.             ***])
+                          AC_MSG_WARN([*** ImageMagick input handler is disabled.           ***])