Fix to new ImageMagick API. Upgrade to latest Debian patchset version.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 108 insertions, 12 deletions

diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index dc8d6a722888..13efa9446dbd 100644
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/autotrace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.43 2010/07/10 17:19:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.44 2010/07/10 18:31:44 ssuominen Exp $
+
+*autotrace-0.31.1-r6 (10 Jul 2010)
+
+  10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +autotrace-0.31.1-r6.ebuild, +files/autotrace-0.31.1-GetOnePixel.patch,
+  +files/autotrace-0.31.1-libpng14.patch:
+  Fix to new ImageMagick API. Upgrade to latest Debian patchset version.
 
   10 Jul 2010; Raúl Porcel <armin76@gentoo.org> autotrace-0.31.1-r5.ebuild:
   alpha/ia64/sparc stable wrt #322745
diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index c40fdefa9afd..08aff41e59a3 100644
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -1,8 +1,13 @@
+AUX autotrace-0.31.1-GetOnePixel.patch 555 RMD160 bb55311136c698ada877930a65eda40b3bcdcf9d SHA1 5febded67fd03c8550e5a60fda389bb048e3b1bd SHA256 9398fcb0a41a0ad51b23e5bff39efc82375a0ce873158c868de980a29bb24f1d
+AUX autotrace-0.31.1-libpng14.patch 623 RMD160 4573849898ae6766f22545dcaa2695232001ba06 SHA1 2ed7bdb24bcc7dd51778e40858e23c7ee90f47ab SHA256 722901c2bf2cfd53c17debf5f408c55b14ae0cf6b37773489694a7b10f698904
 AUX autotrace-0.31.1-m4.patch 121 RMD160 15733eebcb18b195eda00a86b0adb6e2870413d9 SHA1 1a4469c13f01d0a71fba86919ac83c919c4be534 SHA256 66261c31aa82ce3bd3693746b7d8915b20373188751b4b2d6bc451913910bf95
-AUX autotrace-0.31.1-pkgconfig.patch 475 RMD160 052e846489dab55b86345322e33e53751c1e858f SHA1 090136962e1c6e85f7c629d2b35ea4a05beb26ff SHA256 669b17ceea8f0b3f636b4f30ab0904018b978b6b0d8c5a08150d3ef65960020f
-AUX autotrace-0.31.1-swf-output.patch 706 RMD160 95afabc3d4a7c51aeeb78f2814b96985b390ce4d SHA1 0c168649af4240c2f7513b4e1d4bec7a71f1d20a SHA256 d808aa48589574bc545d7095c17a7fcf68d16676b06a5abcb374abc683d9fe13
+AUX autotrace-0.31.1-pkgconfig.patch 431 RMD160 e1780fb9011d2255f4397ef8791e2746cc0b3abc SHA1 69158f3aa157e13562d2d610c1a9170118e2fd30 SHA256 3e52ff84015214a2b0e094122e368299b03cfed77dcf98f6df3c316bda300072
+AUX autotrace-0.31.1-swf-output.patch 585 RMD160 9df3a81a42dde77faf957178d8011e75e652e162 SHA1 cff2e3e84e78b741ab8d0a326193900a9bfab0f3 SHA256 d4089185e2a89d75a897012cde91bd88953914cc52ce545999999114da2cb485
 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
+DIST autotrace_0.31.1-15.diff.gz 343197 RMD160 61b924e0ba7bcb61973261fe036816bb47ce9d36 SHA1 63f8fda0bed0f228b09a17944848b9a1eda0c733 SHA256 d7084e992ef43db3dec5f912ba757c616b4698aeea17b9c167f2686c3f2df9c9
+DIST autotrace_0.31.1.orig.tar.gz 362718 RMD160 9d008c6c519da7e006cb83ae6012f4d9e4e8b0ba SHA1 679e4912528030b86f23db5b99e60f8e7df883fd SHA256 5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6
 EBUILD autotrace-0.31.1-r5.ebuild 1471 RMD160 05b3d5a3e3ddb1e5db24d3e08404dadba261cf48 SHA1 fe9aa8143aea4a63d599610231edcaf5d3194303 SHA256 b5c11be2fe83606cb604071fef2bc7b261e729c385fc500a86ee5d1bc8542cd4
-MISC ChangeLog 5807 RMD160 c3ab76014ffc233b1f897d9781b1ccf4a0013c08 SHA1 f56cb5c35e027609cb5f9cd99b169359b7487b70 SHA256 470cbc80d5e09ed006efb670db267355913740cbadffa1402a9f58368d5cba88
+EBUILD autotrace-0.31.1-r6.ebuild 1331 RMD160 787cd5d39646a252e1a9c85b46142559f4c49de2 SHA1 94a0988caa0b64dbc9c6dbee0139501459c9e8bd SHA256 3a583341dfb68e0019676a1e02e7e5edc4b08fd3af234a1317356f7a83f1bc12
+MISC ChangeLog 6089 RMD160 e31cdba090dc950ad42da01d09b1d7ee38e4cdc3 SHA1 37f8beb69d61dad287c4ddb7ab028d367bec9a65 SHA256 27e47a1613b1d0ce657609705f729d625effe6186c0d51f0e455c80764dd777d
 MISC metadata.xml 180 RMD160 e6df1c281c045a4df87dc49fd33cb39983fc2dd0 SHA1 20e0ae6775bfa870dcddb411f2e8764513455e58 SHA256 3c7662f320558520f532951eab1b9a95afde23b4825e90defa915d9025590941
diff --git a/media-gfx/autotrace/autotrace-0.31.1-r6.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r6.ebuild
new file mode 100644
index 000000000000..07e31c96ddd2
--- /dev/null
+++ b/media-gfx/autotrace/autotrace-0.31.1-r6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 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-r6.ebuild,v 1.1 2010/07/10 18:31:44 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils
+
+_dpatch=15
+
+DESCRIPTION="A program for converting bitmaps to vector graphics"
+HOMEPAGE="http://packages.qa.debian.org/a/autotrace.html http://autotrace.sourceforge.net/"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV}-${_dpatch}.diff.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+imagemagick"
+
+RDEPEND="media-libs/libexif
+	>=media-libs/libpng-1.4.3
+	>=media-libs/ming-0.4.2
+	>=media-gfx/pstoedit-3.50
+	imagemagick? ( >=media-gfx/imagemagick-6.6.2.5 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV}-${_dpatch}.diff
+
+	epatch "${FILESDIR}"/${P}-{m4,libpng14,pkgconfig}.patch \
+		"${FILESDIR}"/${P}-swf-output.patch \
+		"${FILESDIR}"/${P}-GetOnePixel.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with imagemagick magick) \
+		--with-ming \
+		--with-pstoedit
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-GetOnePixel.patch b/media-gfx/autotrace/files/autotrace-0.31.1-GetOnePixel.patch
new file mode 100644
index 000000000000..048b7a76be70
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-GetOnePixel.patch
@@ -0,0 +1,16 @@
+http://cvs.fedoraproject.org/viewvc/rpms/autotrace/devel/autotrace-0.31.1-GetOnePixel.patch?view=markup
+
+--- input-magick.c
++++ input-magick.c
+@@ -83,7 +83,11 @@
+ 
+   for(j=0,runcount=0,point=0;j<image->rows;j++)
+     for(i=0;i<image->columns;i++) {
++#if (MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649)
+       p=GetOnePixel(image,i,j);
++#else
++      GetOnePixel(image,i,j,pixel);
++#endif
+       AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */
+       if(np==3) {
+         AT_BITMAP_BITS(bitmap)[point++]=pixel->green;
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-libpng14.patch b/media-gfx/autotrace/files/autotrace-0.31.1-libpng14.patch
new file mode 100644
index 000000000000..72f76bcf1535
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-libpng14.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/321525
+
+--- configure.in
++++ configure.in
+@@ -188,9 +188,9 @@
+ 		HAVE_LIBPNG=yes ,,-lz -lm)
+ 	if test "x$HAVE_LIBPNG" = "xyes" ; then
+ 		LIBPNG_LDFLAGS="-lpng -lz -lm"
+-                PKGCONFIG_REQS="$PKGCONFIG_REQS, libpng12"
+-                if pkg-config --exists libpng12 ; then
+-                   LIBPNG_LDFLAGS="`pkg-config --libs libpng12`"
++                PKGCONFIG_REQS="$PKGCONFIG_REQS, libpng"
++                if pkg-config --exists libpng ; then
++                   LIBPNG_LDFLAGS="`pkg-config --libs libpng`"
+                 fi
+ 		AC_SUBST(LIBPNG_LDFLAGS)
+ 		AC_DEFINE(HAVE_LIBPNG)
diff --git a/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch b/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch
index 49619082253d..a6371dd3c725 100644
--- a/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch
@@ -1,7 +1,7 @@
-diff --git a/configure.in b/configure.in
-index 564b32f..b396b26 100644
---- a/configure.in
-+++ b/configure.in
+http://bugs.gentoo.org/283534
+
+--- configure.in
++++ configure.in
 @@ -223,7 +223,7 @@ if test "${swf_header_found}" = yes ; then
  	AC_CHECK_LIB(ming, Ming_init, 
  		     HAVE_LIBSWF=yes,,-lm)
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
index 7deed35b1820..b9132c2ac529 100644
--- a/media-gfx/autotrace/files/autotrace-0.31.1-swf-output.patch
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-swf-output.patch
@@ -1,5 +1,7 @@
---- output-swf.c.old	2006-04-01 21:50:06.000000000 -0500
-+++ output-swf.c	2006-04-01 21:50:28.000000000 -0500
+http://bugs.gentoo.org/122035
+
+--- output-swf.c
++++ output-swf.c
 @@ -24,7 +24,6 @@
  #include "spline.h"
  #include "color.h"
@@ -9,8 +11,8 @@
  #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
+--- output-swf.h
++++ output-swf.h
 @@ -23,6 +23,7 @@
  #define OUTPUTSWF_H