6 files changed, 11 insertions, 86 deletions
diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 53bd20d71fb1..64672f48ef81 100644
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/autotrace
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.27 2008/09/12 22:31:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.28 2008/11/02 17:12:29 loki_val Exp $
+
+  02 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/autotrace-0.31.1-m4.patch, -files/autotrace-imagemagick.patch,
+  -autotrace-0.31.1-r1.ebuild, autotrace-0.31.1-r3.ebuild:
+  punt old
 
   12 Sep 2008; Markus Meier <maekke@gentoo.org> autotrace-0.31.1-r3.ebuild:
   amd64 stable, bug #236287
diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index b01ea4e33d23..97570f15ee76 100644
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX autotrace-0.31.1-m4.patch 121 RMD160 15733eebcb18b195eda00a86b0adb6e2870413d9 SHA1 1a4469c13f01d0a71fba86919ac83c919c4be534 SHA256 66261c31aa82ce3bd3693746b7d8915b20373188751b4b2d6bc451913910bf95
 AUX autotrace-0.31.1-swf-output.patch 706 RMD160 95afabc3d4a7c51aeeb78f2814b96985b390ce4d SHA1 0c168649af4240c2f7513b4e1d4bec7a71f1d20a SHA256 d808aa48589574bc545d7095c17a7fcf68d16676b06a5abcb374abc683d9fe13
-AUX autotrace-imagemagick.patch 962 RMD160 8059a635d6440c62708abfd8dea004ee93bef491 SHA1 7d77db7f1a8e56fee462ac5a81a7fd9c7ce3506e SHA256 f647be633ea59b0f9420e24143e973143b59c455c36bc8f77317213878131c11
 DIST autotrace-0.31.1.tar.gz 362718 RMD160 9d008c6c519da7e006cb83ae6012f4d9e4e8b0ba SHA1 679e4912528030b86f23db5b99e60f8e7df883fd SHA256 5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6
 DIST autotrace_0.31.1-13.diff.gz 343712 RMD160 59c0305e55077bce34e139b6b93e93c306afbfcd SHA1 12650040e9072ef11bd9eea3ddd41fe2832e0355 SHA256 d708b3325672d25eb6587c3389b50eb580324318430e5f0154f8f179b56914c6
-EBUILD autotrace-0.31.1-r1.ebuild 1019 RMD160 e58000a09db2870efb3444eb1df03ff5298a02a6 SHA1 881d254d09549b79ace083282cda7eb02efff722 SHA256 624940baf875ac598c0c8263324a508f5c1062613652236dc25cec67b497480d
-EBUILD autotrace-0.31.1-r3.ebuild 1272 RMD160 d91d161d7100d5a0a952c22776cc242f3b71ce24 SHA1 4efbf2b8728e70e0a3a2760f971ede10fc3b481a SHA256 5b24afa1c925c17d5023444f5e0306957f018d9320b70bf0830a27272c8991b8
-MISC ChangeLog 3620 RMD160 5e9ad7f634b04847b288da062989255fd40f161f SHA1 2741b6ba9d52c6afb9091e747fde0d0b2649800a SHA256 ffd9ed79ceb8939070831ee01e9add5beccaee268462bdfccdc8756df6e40cc7
+EBUILD autotrace-0.31.1-r3.ebuild 1237 RMD160 920766247f7fcf1031b5413b8320dff0ced77fe3 SHA1 b867e38a949965bb66971cee17e02b47365f3fff SHA256 71bd9c05c8dda161d176ffdc4ed79ba3b6da1773aea0dfaedde2575b1832a7b3
+MISC ChangeLog 3818 RMD160 8794b740862ee3c2eeb2bfe5c05487aeb5bb382a SHA1 e3d1faad841bd2972f5cad928d5c2c5b0a7bb7dd SHA256 58a72d924a2b15d2d54c5e98914a7d29ce50d3422d43d0939c9d4dccdca8e486
 MISC metadata.xml 398 RMD160 8210998d5102ee057b6cec0397e9b5e6834d0599 SHA1 226a673a413114c6cb5b52cab490202ad812cf78 SHA256 8df3c7ba8d16fd185a144783b22e079b241d7f27e99959ddaee8edf1bedfe3d5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjK7h0ACgkQkKaRLQcq0GKtAgCfUnfbFnTa/Fu4vczQWx8g5rt3
-gx4AoIRlCB3d2C7hgYbBkTMzaTaihHuy
-=fozE
------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
deleted file mode 100644
index 4b57472b00ce..000000000000
--- a/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 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.17 2006/03/27 21:32:14 agriffis Exp $
-
-inherit eutils
-
-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="x86 alpha ppc amd64 sparc ia64"
-IUSE="png flash imagemagick"
-
-DEPEND="media-libs/libexif
-	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}"/${PN}-imagemagick.patch
-	autoconf || die
-}
-
-src_compile() {
-	local myconf=""
-	use imagemagick || myconf="--without-magick"
-	econf ${myconf} --without-pstoedit || die
-	emake || die
-}
-
-src_install() {
-	make 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
index dfcfd900c18a..0ee461cba125 100644
--- a/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild
+++ b/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2008/09/12 22:31:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.31.1-r3.ebuild,v 1.6 2008/11/02 17:12:29 loki_val Exp $
 
 EAPI=1
 
@@ -24,12 +24,8 @@ RDEPEND="media-libs/libexif
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	epatch ../autotrace_0.31.1-13.diff
-	epatch "${FILESDIR}"/${P}-swf-output.patch
-}
+PATCHES=(	"${WORKDIR}/autotrace_0.31.1-13.diff"
+		"${FILESDIR}/${P}-swf-output.patch"	)
 
 src_compile() {
 	#Autotrace will autolink to ming if present. Forcing on.
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-m4.patch b/media-gfx/autotrace/files/autotrace-0.31.1-m4.patch
deleted file mode 100644
index 7781be784f01..000000000000
--- a/media-gfx/autotrace/files/autotrace-0.31.1-m4.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- autotrace.m4
-+++ autotrace.m4
-@@ -6,3 +6,3 @@
- dnl
--AC_DEFUN(AM_PATH_AUTOTRACE,
-+AC_DEFUN([AM_PATH_AUTOTRACE],
- [dnl
diff --git a/media-gfx/autotrace/files/autotrace-imagemagick.patch b/media-gfx/autotrace/files/autotrace-imagemagick.patch
deleted file mode 100644
index bd33f2644f33..000000000000
--- a/media-gfx/autotrace/files/autotrace-imagemagick.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.           ***])