Fix broken pkgconfig file, bug #283534 by Dominique Michel. Patch from

Alexandre Rostovtsev.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 85 insertions, 2 deletions

diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 18d7d8587308..4cff1c5d9f5d 100644
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/autotrace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.32 2009/09/06 23:47:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.33 2009/09/18 23:17:26 dirtyepic Exp $
+
+*autotrace-0.31.1-r4 (18 Sep 2009)
+
+  18 Sep 2009; Ryan Hill <dirtyepic@gentoo.org> +autotrace-0.31.1-r4.ebuild,
+  +files/autotrace-0.31.1-pkgconfig.patch:
+  Fix broken pkgconfig file, bug #283534 by Dominique Michel. Patch from
+  Alexandre Rostovtsev.
 
   06 Sep 2009; Brent Baude <ranger@gentoo.org> autotrace-0.31.1-r3.ebuild:
   Marking autotrace-0.31.1-r3 ~ppc64 for bug 281573
diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index 18b2a832f9bf..a7ea05c8b08f 100644
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -1,7 +1,19 @@
+-----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-pkgconfig.patch 475 RMD160 052e846489dab55b86345322e33e53751c1e858f SHA1 090136962e1c6e85f7c629d2b35ea4a05beb26ff SHA256 669b17ceea8f0b3f636b4f30ab0904018b978b6b0d8c5a08150d3ef65960020f
 AUX autotrace-0.31.1-swf-output.patch 706 RMD160 95afabc3d4a7c51aeeb78f2814b96985b390ce4d SHA1 0c168649af4240c2f7513b4e1d4bec7a71f1d20a SHA256 d808aa48589574bc545d7095c17a7fcf68d16676b06a5abcb374abc683d9fe13
 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-r3.ebuild 1282 RMD160 14773300a88d8faa0996a49eee7c6c5538e84e33 SHA1 26f96856b4abdd37fb4bbb2cd10bbf8a27a6f640 SHA256 96576e37640e0e635be10ae1c03a58a530b88870266e223534f8cc2102e2a60e
-MISC ChangeLog 4294 RMD160 2cf008d6c21798bd3e694cc66e403ee221d4500a SHA1 f4999821087d3d2702fda0b0854ab592947196bc SHA256 62fd242099e78213135186c05be2feb4866f56af4a94e80b8d13cc6a035e6cb4
+EBUILD autotrace-0.31.1-r4.ebuild 1415 RMD160 250cec881af0348d376c78392c44f253b1d918b8 SHA1 8650a7a5c69b49a65c3aaf15c0d3bb346755e65b SHA256 be6e54724f1dc5f3abc2821d072fa94f0ce99db17bf325a4b24761df0402e871
+MISC ChangeLog 4551 RMD160 b05eb16f62cc40993c84f596f016e768797bcd7e SHA1 3ccec79f1374b85387ca2a8d2bd35643c8dd20eb SHA256 c500d705d890eef594c252fd979eb6f0e03171fa888424c3929f923bbcaf3b5f
 MISC metadata.xml 243 RMD160 91507ba03cd9e8428f1730f76eacf1d4c0eaa202 SHA1 4317ceab9082e8c30a5e95c3806447627ecc367b SHA256 2e23c8a8ad25c818d7c0c679ae54a91fb93d5204a741a3c7def330ecca90593a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq0FTsACgkQiqiDRvmkBmJdUwCgsDh96mcqqfcf3uPCwQKAUJM+
+6f8AoKnvvIM03MgSujT79UuLER1qEBW0
+=2zKT
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/autotrace/autotrace-0.31.1-r4.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r4.ebuild
new file mode 100644
index 000000000000..d480f01bc52e
--- /dev/null
+++ b/media-gfx/autotrace/autotrace-0.31.1-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/09/18 23:17:26 dirtyepic Exp $
+
+EAPI=1
+
+inherit 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+imagemagick +pdf"
+
+RDEPEND="media-libs/libexif
+	>=media-libs/libpng-1.2.5-r4
+	>=media-libs/ming-0.3.0
+	pdf? ( >=media-gfx/pstoedit-3.45-r1 )
+	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/autotrace_0.31.1-13.diff
+	epatch "${FILESDIR}"/${P}-swf-output.patch
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch	# bug 283534
+	eautoreconf
+}
+
+src_compile() {
+	# Autotrace will autolink to ming if present. Forcing on.
+	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-pkgconfig.patch b/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch
new file mode 100644
index 000000000000..49619082253d
--- /dev/null
+++ b/media-gfx/autotrace/files/autotrace-0.31.1-pkgconfig.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index 564b32f..b396b26 100644
+--- a/configure.in
++++ b/configure.in
+@@ -223,7 +223,7 @@ if test "${swf_header_found}" = yes ; then
+ 	AC_CHECK_LIB(ming, Ming_init, 
+ 		     HAVE_LIBSWF=yes,,-lm)
+ 	if test "$HAVE_LIBSWF" = "yes" ; then
+-                PKGCONFIG_REQS="$PKGCONFIG_REQS, ming"
++                PKGCONFIG_REQS="$PKGCONFIG_REQS, libming"
+ 		LIBSWF_LDFLAGS="-lming -lm"
+ 		AC_SUBST(LIBSWF_LDFLAGS)
+ 		AC_DEFINE(HAVE_LIBSWF)