Cleanup ebuild, add support for USE=pdf, and fix linking of libautotrace.

Package-Manager: portage-2.1.2

diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 5b532078280ef555cca77a36ac80365c4628f8e4..4fe2009872c348dadbfebd8aa711b6994568a476 100644 (file)
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/autotrace
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.20 2006/03/27 21:32:14 agriffis Exp $
+# 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 $
+
+*autotrace-0.31.1-r2 (20 Jan 2007)
+
+  20 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/autotrace-0.31.1-libs.patch, +autotrace-0.31.1-r2.ebuild:
+  Cleanup ebuild, add support for USE=pdf, and fix linking of libautotrace.
 
   27 Mar 2006; Aron Griffis <agriffis@gentoo.org> -autotrace-0.31.1.ebuild,
   autotrace-0.31.1-r1.ebuild:

diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index 654e81987aca5224971c58d6cd08d7153c1a8f20..0788e828d7ce07c5d1076ad4b29aadf7fc4b7bcd 100644 (file)
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -1,28 +1,45 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0fbd5b6b2426342eac2a71479d3d3935 ChangeLog 2467
-RMD160 80dce43ac98d33e8842cce834bc83503f6b95361 ChangeLog 2467
-SHA256 01b2e53df404fd9f29d018c90935d0f7f8863093636b28b980b0bfdb2c5a264e ChangeLog 2467
-MD5 36aae39b0b42e1ba290bc567f36e9b27 autotrace-0.31.1-r1.ebuild 1019
-RMD160 e58000a09db2870efb3444eb1df03ff5298a02a6 autotrace-0.31.1-r1.ebuild 1019
-SHA256 624940baf875ac598c0c8263324a508f5c1062613652236dc25cec67b497480d autotrace-0.31.1-r1.ebuild 1019
+AUX autotrace-0.31.1-libs.patch 750 RMD160 d587b6c5bd711495b58212889bd846f91f473612 SHA1 11e1b2f082640fcc4e6bb727c4ad1d3202e835d2 SHA256 80581e1837791e1f8ab0a0bfc08d498a7d85f39beef3e7c19ba32b9ee3b6700c
+MD5 c81f3d1f1c07db5c150db15eadb93d1c files/autotrace-0.31.1-libs.patch 750
+RMD160 d587b6c5bd711495b58212889bd846f91f473612 files/autotrace-0.31.1-libs.patch 750
+SHA256 80581e1837791e1f8ab0a0bfc08d498a7d85f39beef3e7c19ba32b9ee3b6700c files/autotrace-0.31.1-libs.patch 750
+AUX autotrace-0.31.1-m4.patch 121 RMD160 15733eebcb18b195eda00a86b0adb6e2870413d9 SHA1 1a4469c13f01d0a71fba86919ac83c919c4be534 SHA256 66261c31aa82ce3bd3693746b7d8915b20373188751b4b2d6bc451913910bf95
 MD5 20a5d0ef64911286e0f15a85ca935782 files/autotrace-0.31.1-m4.patch 121
 RMD160 15733eebcb18b195eda00a86b0adb6e2870413d9 files/autotrace-0.31.1-m4.patch 121
 SHA256 66261c31aa82ce3bd3693746b7d8915b20373188751b4b2d6bc451913910bf95 files/autotrace-0.31.1-m4.patch 121
+AUX autotrace-imagemagick.patch 962 RMD160 8059a635d6440c62708abfd8dea004ee93bef491 SHA1 7d77db7f1a8e56fee462ac5a81a7fd9c7ce3506e SHA256 f647be633ea59b0f9420e24143e973143b59c455c36bc8f77317213878131c11
 MD5 e5551f2f94c0ff55ce8a6394e574dcc5 files/autotrace-imagemagick.patch 962
 RMD160 8059a635d6440c62708abfd8dea004ee93bef491 files/autotrace-imagemagick.patch 962
 SHA256 f647be633ea59b0f9420e24143e973143b59c455c36bc8f77317213878131c11 files/autotrace-imagemagick.patch 962
-MD5 f142e4322a72c3246f11a99b53e2d702 files/digest-autotrace-0.31.1-r1 68
-RMD160 65b7621664154b175b892069697ce570418aa007 files/digest-autotrace-0.31.1-r1 68
-SHA256 5730ed603dc1e19872289d82f2f0bb946ca366ec6e99e38454775c7eee6ede65 files/digest-autotrace-0.31.1-r1 68
+DIST autotrace-0.31.1.tar.gz 362718 RMD160 9d008c6c519da7e006cb83ae6012f4d9e4e8b0ba SHA1 679e4912528030b86f23db5b99e60f8e7df883fd SHA256 5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6
+EBUILD autotrace-0.31.1-r1.ebuild 1019 RMD160 e58000a09db2870efb3444eb1df03ff5298a02a6 SHA1 881d254d09549b79ace083282cda7eb02efff722 SHA256 624940baf875ac598c0c8263324a508f5c1062613652236dc25cec67b497480d
+MD5 36aae39b0b42e1ba290bc567f36e9b27 autotrace-0.31.1-r1.ebuild 1019
+RMD160 e58000a09db2870efb3444eb1df03ff5298a02a6 autotrace-0.31.1-r1.ebuild 1019
+SHA256 624940baf875ac598c0c8263324a508f5c1062613652236dc25cec67b497480d autotrace-0.31.1-r1.ebuild 1019
+EBUILD autotrace-0.31.1-r2.ebuild 1144 RMD160 45c7f463d6a89ba8a1e220269a60192d80e0957a SHA1 6b601d3ba18d1ae7b8a9ab43df673320339a59b7 SHA256 92ebfa1af99783f282fbcd4ac12d2046696d65893114da2777f48d0dd6e74978
+MD5 9484a14174e2c2b4afc171a1e6adf320 autotrace-0.31.1-r2.ebuild 1144
+RMD160 45c7f463d6a89ba8a1e220269a60192d80e0957a autotrace-0.31.1-r2.ebuild 1144
+SHA256 92ebfa1af99783f282fbcd4ac12d2046696d65893114da2777f48d0dd6e74978 autotrace-0.31.1-r2.ebuild 1144
+MISC ChangeLog 2695 RMD160 79731c578d61360ecd12dc543d12f97426940409 SHA1 351c850829128e00be0648b00314962d356000f0 SHA256 2634632b284ce9077805317ab681eead49bb8d1b60310561e63adb01e7cc7524
+MD5 da320e827dee0afea8a25628e1cc1456 ChangeLog 2695
+RMD160 79731c578d61360ecd12dc543d12f97426940409 ChangeLog 2695
+SHA256 2634632b284ce9077805317ab681eead49bb8d1b60310561e63adb01e7cc7524 ChangeLog 2695
+MISC metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 SHA1 2dd01d07170c2cf8b971ff1c98060ed021f11abb SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576
 MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
 RMD160 06142079e0afba051758f76a7ef850183217e8a4 metadata.xml 223
 SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576 metadata.xml 223
+MD5 f3f25c77d44c99d07a8f72f142dce7d1 files/digest-autotrace-0.31.1-r1 250
+RMD160 c7da9b65fa28e1007814e59062f80324697fa031 files/digest-autotrace-0.31.1-r1 250
+SHA256 de909dce40d0b071c9b7ee8dd8e02831df7111ebe81c45b4430e8d96830de921 files/digest-autotrace-0.31.1-r1 250
+MD5 f3f25c77d44c99d07a8f72f142dce7d1 files/digest-autotrace-0.31.1-r2 250
+RMD160 c7da9b65fa28e1007814e59062f80324697fa031 files/digest-autotrace-0.31.1-r2 250
+SHA256 de909dce40d0b071c9b7ee8dd8e02831df7111ebe81c45b4430e8d96830de921 files/digest-autotrace-0.31.1-r2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEKFnoJrHF4yAQTrARAsDGAJ471Gt22Jbc3RwVyTWVClmVhuItsACgg7p3
-UBZMIMdx5kyAjpGh6HSoNLE=
-=ktfA
+iD8DBQFFsiS78bi6rjpTunYRAjzsAJwNEUGhffYtbIAzOTMmWBqfS9GCmwCdFJGx
++tPPBYQy3LDHn8PTLo8ZvMQ=
+=Ew+M
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild
new file mode 100644 (file)
index 0000000..adcc2ca
--- /dev/null
+++ b/media-gfx/autotrace/autotrace-0.31.1-r2.ebuild
@@ -0,0 +1,43 @@
+# 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/files/autotrace-0.31.1-libs.patch b/media-gfx/autotrace/files/autotrace-0.31.1-libs.patch
new file mode 100644 (file)
index 0000000..c4d8ab4
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-libs.patch
@@ -0,0 +1,32 @@
+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/digest-autotrace-0.31.1-r1 b/media-gfx/autotrace/files/digest-autotrace-0.31.1-r1
index 91878928ee18affe9e3a065c0a1e9b1d8ac2b4e3..c6da231a0a506c951ae38994d632e0d7d60d60af 100644 (file)
--- a/media-gfx/autotrace/files/digest-autotrace-0.31.1-r1
+++ b/media-gfx/autotrace/files/digest-autotrace-0.31.1-r1
@@ -1 +1,3 @@
 MD5 54eabbb38d2076ded6d271e1ee4d0783 autotrace-0.31.1.tar.gz 362718
+RMD160 9d008c6c519da7e006cb83ae6012f4d9e4e8b0ba autotrace-0.31.1.tar.gz 362718
+SHA256 5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6 autotrace-0.31.1.tar.gz 362718

diff --git a/media-gfx/autotrace/files/digest-autotrace-0.31.1-r2 b/media-gfx/autotrace/files/digest-autotrace-0.31.1-r2
new file mode 100644 (file)
index 0000000..c6da231
--- /dev/null
+++ b/media-gfx/autotrace/files/digest-autotrace-0.31.1-r2
@@ -0,0 +1,3 @@
+MD5 54eabbb38d2076ded6d271e1ee4d0783 autotrace-0.31.1.tar.gz 362718
+RMD160 9d008c6c519da7e006cb83ae6012f4d9e4e8b0ba autotrace-0.31.1.tar.gz 362718
+SHA256 5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6 autotrace-0.31.1.tar.gz 362718

diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index a264b828373d912f4fe46197da5f0a6bf5d144fc..59bcc4b713ce88dbeb8ec70d86a0dfec79e3e1ac 100644 (file)
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pstoedit-m4-quoting.patch 469 RMD160 398695f4bf3ebec83202fb5de9c096050f12ee68 SHA1 b9a72a0832a80d838cbb6d53bd49a900b4d3b98b SHA256 5498f27174dc0dd117032b277f8a02d13b0a9ba441e43586f01935acafeabcc5
 MD5 3f295680df5273d98ed01e739e23b8cc files/pstoedit-m4-quoting.patch 469
 RMD160 398695f4bf3ebec83202fb5de9c096050f12ee68 files/pstoedit-m4-quoting.patch 469
 SHA256 5498f27174dc0dd117032b277f8a02d13b0a9ba441e43586f01935acafeabcc5 files/pstoedit-m4-quoting.patch 469
 DIST pstoedit-3.33.tar.gz 729661 RMD160 f2b9b3c7445210a0f68965d24de61849589ddd0b SHA1 7b60d1742828cbef3a4455ac37d7b91521bcfbf9 SHA256 f6d9e5d9800c1ec05ed7328d624ed995f608c40fa8c2e0dae39480881679a7b9
-DIST pstoedit-3.40.tar.gz 791425 RMD160 e55d6b5086a3fd76334ef488a081d8cbde023389 SHA256 868b54e62de25628d3d4e038ec0543399f8f791dd9272620685bd88073518869
+DIST pstoedit-3.40.tar.gz 791425 RMD160 e55d6b5086a3fd76334ef488a081d8cbde023389 SHA1 9083f13257c988e7500a1ee3841e9836d58e5b1f SHA256 868b54e62de25628d3d4e038ec0543399f8f791dd9272620685bd88073518869
 DIST pstoedit-3.42.tar.gz 807598 RMD160 8ed9827bf7626cbeff07f050322cc60e48e091bc SHA1 fa29fa03826fabb9143d561518fe91a115743a83 SHA256 fcdddaee451c365b61c7f14e4b009b45b7d19ab4e09b6028b856bfa8b9ae3b6e
 EBUILD pstoedit-3.33.ebuild 1468 RMD160 4c3ec2d17c76ec3b7924f770e62e6891bf1da92a SHA1 ea501134a3c741f977866704328756a9d90b077f SHA256 df5ec259a32bf647a2018a763191f58089f4c0b13bf8d0bb5186e02fd8fd5f48
 MD5 86c19385f574e106c3f3f7c75fb98a64 pstoedit-3.33.ebuild 1468
@@ -13,10 +16,10 @@ EBUILD pstoedit-3.40.ebuild 1519 RMD160 7ab0138c41b4ba5f08a789d1cff4567ca9f839c8
 MD5 5a91f05aed2595611256f48111e9c91b pstoedit-3.40.ebuild 1519
 RMD160 7ab0138c41b4ba5f08a789d1cff4567ca9f839c8 pstoedit-3.40.ebuild 1519
 SHA256 746c96760b5f88bc867a329b3958bce0acab92d167bac6bfb6b9fd12c66bc65e pstoedit-3.40.ebuild 1519
-EBUILD pstoedit-3.42.ebuild 1527 RMD160 2d5080a85872e5b8a021ebc2a5334191cf6ef6d8 SHA1 2b744e918ee8b71e705869bc536a8fd375fe5e7e SHA256 de9074303c3f0433d7372f79611548ff79d4a16540c09913ed5e7c2900367b99
-MD5 6de2bc01671dacc463eda01e06840dcd pstoedit-3.42.ebuild 1527
-RMD160 2d5080a85872e5b8a021ebc2a5334191cf6ef6d8 pstoedit-3.42.ebuild 1527
-SHA256 de9074303c3f0433d7372f79611548ff79d4a16540c09913ed5e7c2900367b99 pstoedit-3.42.ebuild 1527
+EBUILD pstoedit-3.42.ebuild 1533 RMD160 af3e86d013944c6c56aaf15816a38fa25fe3c787 SHA1 19fe04fd7ac86b8a5104eb89ff6247a4d9400f2d SHA256 0a7b954bab7830ae1dcff48132ef79a0166cd4ec12d54098122bc8b2e8bdf16f
+MD5 f2f44460135c191ea6c58f9792f05bcc pstoedit-3.42.ebuild 1533
+RMD160 af3e86d013944c6c56aaf15816a38fa25fe3c787 pstoedit-3.42.ebuild 1533
+SHA256 0a7b954bab7830ae1dcff48132ef79a0166cd4ec12d54098122bc8b2e8bdf16f pstoedit-3.42.ebuild 1533
 MISC ChangeLog 3928 RMD160 4a155dab264a34182b0e673d17453b584932de44 SHA1 64187485d2dc52eeebd4a70cfb1bc8e4bac25129 SHA256 f2b7c4997e7340961aad294d22c95f5450251317012282d2197bc2a21a76a3d6
 MD5 629d5dee210535aef13869436cfc97b0 ChangeLog 3928
 RMD160 4a155dab264a34182b0e673d17453b584932de44 ChangeLog 3928
@@ -34,3 +37,10 @@ SHA256 acc74f263083be57bba738873f3ac81420d3ace58aaa55bdbeb76fa871af7c07 files/di
 MD5 82b93d5f23ce148465049abd258c3818 files/digest-pstoedit-3.42 241
 RMD160 1cd1e9bac1450f1c7d5003296173fc9f41b020ae files/digest-pstoedit-3.42 241
 SHA256 20458319695a5807b44e57c85fb3d02d9f4a8e4dbfbb134a4d77266397552dab files/digest-pstoedit-3.42 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFsiV08bi6rjpTunYRAsg8AKCzIiPNIyVeUZNYZiIixcSxfC4AlACeOKsI
+jUjm82f50tv9WuHQfXU62FE=
+=CJ9W
+-----END PGP SIGNATURE-----