Added debian patches, fixed bugs 192474, 175414 and 122035. Added fonts herd and myself to metadata.

(Portage version: 2.1.5.4)

6 files changed, 89 insertions, 78 deletions

diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 4fe2009872c3..24e58f7a568d 100644
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/autotrace
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.21 2007/01/20 14:18:14 vapier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.22 2008/06/09 07:55:44 loki_val Exp $
+
+*autotrace-0.31.1-r3 (09 Jun 2008)
+
+  09 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/autotrace-0.31.1-libs.patch,
+  +files/autotrace-0.31.1-swf-output.patch, metadata.xml,
+  -autotrace-0.31.1-r2.ebuild, +autotrace-0.31.1-r3.ebuild:
+  Added debian patches, fixed bugs 192474, 175414 and 122035. Added fonts
+  herd and myself to metadata.
 
 *autotrace-0.31.1-r2 (20 Jan 2007)
 
diff --git a/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild
deleted file mode 100644
index adcc2ca8c46a..000000000000
--- a/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/01/20 14:18:14 vapier Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Converts Bitmaps to vector-graphics"
-SRC_URI="mirror://sourceforge/autotrace/${P}.tar.gz"
-HOMEPAGE="http://autotrace.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="flash imagemagick pdf png"
-
-DEPEND="media-libs/libexif
-	pdf? ( media-gfx/pstoedit )
-	png? ( >=media-libs/libpng-1.2.5-r4 )
-	flash? ( >=media-libs/ming-0.2a )
-	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-libs.patch
-	epatch "${FILESDIR}"/${PN}-imagemagick.patch
-	use pdf || echo 'AC_DEFUN([AM_PATH_PSTOEDIT],[$3])' > acinclude.m4
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with imagemagick magick) \
-		$(use_with pdf pstoedit) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild
new file mode 100644
index 000000000000..5af7a7f5051a
--- /dev/null
+++ b/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/06/09 07:55:44 loki_val Exp $
+
+EAPI=1
+
+inherit base eutils autotools
+
+DESCRIPTION="Converts Bitmaps to vector-graphics"
+SRC_URI="mirror://sourceforge/autotrace/${P}.tar.gz
+	mirror://debian/pool/main/a/autotrace/autotrace_0.31.1-13.diff.gz"
+
+HOMEPAGE="http://autotrace.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="+imagemagick +pdf"
+
+DEPEND="media-libs/libexif
+	>=media-libs/libpng-1.2.5-r4
+	>=media-libs/ming-0.3.0
+	pdf? ( media-gfx/pstoedit )
+	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )"
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	epatch ../autotrace_0.31.1-13.diff
+	epatch "${FILESDIR}"/${P}-swf-output.patch
+}
+
+src_compile() {
+	#Autotrace can't link to ming. Perhaps it needs 3.0?
+	econf	--disable-dependency-tracking \
+		--with-ming \
+		$(use_with imagemagick magick) \
+		$(use_with pdf pstoedit) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-libs.patch b/media-gfx/autotrace/files/autotrace-0.31.1-libs.patch
deleted file mode 100644
index c4d8ab4a6147..000000000000
--- a/media-gfx/autotrace/files/autotrace-0.31.1-libs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-the autotrace library uses these libraries, not the autotrace binary
-
---- Makefile.am
-+++ Makefile.am
-@@ -105,6 +105,12 @@
- 		exception.h
- 
- libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libautotrace_la_LIBADD = \
-+		$(MAGICK_LDFLAGS)		\
-+		$(LIBPNG_LDFLAGS)		\
-+		$(LIBSWF_LDFLAGS)		\
-+		$(LIBPSTOEDIT_LIBS)		\
-+		-lm
- 
- #
- # noinst_HEADERS: headers shared between lib and bin.
-@@ -126,13 +132,7 @@
- 		strgicmp.h
- 
- INCLUDES = $(MAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS)
--autotrace_LDADD =				\
--		libautotrace.la			\
--		$(MAGICK_LDFLAGS)		\
--		$(LIBPNG_LDFLAGS)		\
--		$(LIBSWF_LDFLAGS)		\
--		$(LIBPSTOEDIT_LIBS)		\
--		-lm
-+autotrace_LDADD = libautotrace.la
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = autotrace.m4
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-swf-output.patch b/media-gfx/autotrace/files/autotrace-0.31.1-swf-output.patch
new file mode 100644
index 000000000000..7deed35b1820
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-swf-output.patch
@@ -0,0 +1,28 @@
+--- output-swf.c.old	2006-04-01 21:50:06.000000000 -0500
++++ output-swf.c	2006-04-01 21:50:28.000000000 -0500
+@@ -24,7 +24,6 @@
+ #include "spline.h"
+ #include "color.h"
+ #include "output-swf.h"
+-#include <ming.h>
+ 
+ #define FPS 24.0
+ #define IMGID 1
+
+--- output-swf.h.old	2006-04-01 21:50:12.000000000 -0500
++++ output-swf.h	2006-04-01 21:50:59.000000000 -0500
+@@ -23,6 +23,7 @@
+ #define OUTPUTSWF_H 
+ 
+ #include "output.h"
++#include <ming.h>
+ 
+ int output_swf_writer(FILE* file, at_string name,
+ 		      int llx, int lly, int urx, int ury, 
+@@ -31,4 +32,6 @@
+ 		      at_msg_func msg_func, 
+ 		      at_address msg_data);
+ 
++void fileOutputMethod(byte b, void *data);
++
+ #endif /* Not def: OUTPUTSWF_H */
diff --git a/media-gfx/autotrace/metadata.xml b/media-gfx/autotrace/metadata.xml
index d90b5212c1be..16a86be808dc 100644
--- a/media-gfx/autotrace/metadata.xml
+++ b/media-gfx/autotrace/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>graphics</herd>
+<herd>fonts</herd>
 <maintainer>
-<email>graphics@gentoo.org</email>
+	<email>graphics@gentoo.org</email>
+</maintainer>
+<maintainer>
+	<email>loki_val@gentoo.org</email>
 </maintainer>
 </pkgmetadata>