Conditionally apply fix for >=poppler-0.20 (bug #418167 by James Cloos, patch from Arch).

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 28 insertions, 5 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 4db0bcfa1301..726f3a22c953 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.175 2012/05/05 07:00:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.176 2012/05/31 17:37:59 radhermit Exp $
+
+  31 May 2012; Tim Harder <radhermit@gentoo.org> inkscape-0.48.3.1.ebuild:
+  Conditionally apply fix for >=poppler-0.20 (bug #418167 by James Cloos, patch
+  from Arch).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> inkscape-0.48.2.ebuild,
   inkscape-0.48.3.1.ebuild:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 498422b9b94b..5e3a74e98c6d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX inkscape-0.48.0-spell.patch 1815 RMD160 b2b0d777467da3878074734499f96c8bead465cb SHA1 5b68841610b1e7f12c61c88d3df842f679293abd SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f
 AUX inkscape-0.48.1-lcms.patch 368 RMD160 d0be9057ee064cfa87c15dd13b4f4f8c6ee227ca SHA1 55f3c071825f453959d3b1610d8f7682f8a7d8be SHA256 10afc0e2c125229cd9bd7f34cd8ec743ff9188af81e2d6184298374c58102363
 AUX inkscape-0.48.1-libpng15.patch 1616 RMD160 ea6f011b2cd91db106aaed4ff4d387fc20f96214 SHA1 d6512f3cb38ca8e2436dc485aa652490d17b3a52 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87
 AUX inkscape-0.48.2-libwpg.patch 1006 RMD160 207d25adc5bbde4e660a0f0a0723df417fd3817c SHA1 b2beb2c67b8ba8f04f928f2d02cce9d032617cd4 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d
 DIST inkscape-0.48.2.tar.bz2 19583331 RMD160 3f658d373f976a41191d48d8248b33dfb3d65238 SHA1 be30ab2d2714d04ddd69b400bd6ad30b09e83067 SHA256 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
+DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 RMD160 cd5df764400af8634b0732eb11f0d599b934b560 SHA1 aec40e832c3da18ffbbcafdb0b3e498fb3c15bdc SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef
 DIST inkscape-0.48.3.1.tar.bz2 19688778 RMD160 139720f01b987001b558226ec2de60b36fb1123c SHA1 23344555a1b5cc7909ad01d926cfaddb67bfbde9 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88
 EBUILD inkscape-0.48.2.ebuild 2554 RMD160 c82a7fe6c5be02efc09e4eb6eab6d1573809ef0c SHA1 a9e0114c03fc22a0ef4cc498ec158684e9b93686 SHA256 27c941de8640dd2e72527f26eb7a8aacac694c9fcd07d3fc5c98ff336dbef8e7
-EBUILD inkscape-0.48.3.1.ebuild 2481 RMD160 034e34d596a2c2de0a73eafdfe5d25438c3d7792 SHA1 36714ff5ad85d409b9d5f2fa60031ce4e81424b6 SHA256 f518dc7c109480880fa6f3c2959a2545e6c0ad047a4b2d49d370fd1ca4d6e013
-MISC ChangeLog 24735 RMD160 4b32df0ea617514cb63eac871cba2b57b6f557ea SHA1 0c4ec0685ddcfef3c235d9d79ab5096a4a4e08a9 SHA256 9a41ff4296d7c4907d7291ae9c0f29fa5909f6d7caad9bad7e8767f28bb2aeef
+EBUILD inkscape-0.48.3.1.ebuild 2641 RMD160 3ed27dc16795adc58da298d10237898650649d2a SHA1 e5334f06188c646621d6fa20183d82f6c866b350 SHA256 a061ffcba7f46fa8ec559a6cfe4bec6cceb32c06159bec06193cd9f2caf3ed41
+MISC ChangeLog 24908 RMD160 27fe4e7b29ae10eeb3b1fea3cbe485dadea3e29a SHA1 0145311672b870f67db3b938281ba803f800b0c5 SHA256 c1ca928d6cf5b0b162549a018d2a7f2b1d38e1819c0bd73f8d1ce24b6f5e1248
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPx6yCAAoJEEqz6FtPBkyj6sYIAI65jJUeVPqCxhZil7b36969
+yulcnstbATQmaHFqGsiiuRPB6RvXL3/besKzR52y1W7YNMnvkmEEPaiZBIY2V+JC
+h/1KudBIeDATfYm2aTRE1hOxGRvJUatpiTgdzPeWwN80F+R913tl+pvXQAREUH98
+/FhxOlaYDqYCJ3dbsW8q+occkSg26+QIlUVbpdowvo4+ugVTHC2mZRM10VDk0nA9
+Gt4iinsiNrrMYBV336GaqxGvGauVTznPkOkkgww8W2scBbrjgMTJ5zaCHE0gpYCx
+6JvIzQAmQQLo3OPHLlkN1m0oUkMTR4t0uCynu4svkdTRNGrpRPLfPyyg1ip1gtI=
+=IDz2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
index 407a7f36e27c..ac35f7cea13d 100644
--- a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.3 2012/05/05 07:00:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.4 2012/05/31 17:37:59 radhermit Exp $
 
 EAPI=4
 
@@ -11,7 +11,8 @@ inherit autotools eutils flag-o-matic gnome2 python
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~radhermit/dist/${P}-poppler-0.20.patch.bz2"
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
@@ -86,6 +87,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
 		"${FILESDIR}"/${PN}-0.48.1-libpng15.patch \
 		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch
+
+	has_version ">=app-text/poppler-0.20.0" && epatch "${WORKDIR}"/${P}-poppler-0.20.patch
+
 	eautoreconf
 }