fix building with poppler, reported in bug #213026

Package-Manager: portage-2.1.4.4

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index b0962c51a3246ba72264f82397bbab98e04ca4b3..8f43bd648620ccedf94f62727edd13297c533534 100644 (file)
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.84 2008/03/15 09:47:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.85 2008/03/15 16:57:04 maekke Exp $
+
+  15 Mar 2008; Markus Meier <maekke@gentoo.org> inkscape-0.46.ebuild:
+  fix building with poppler, reported in bug #213026
 
   15 Mar 2008; Markus Meier <maekke@gentoo.org> inkscape-0.46.ebuild:
   add missing boost (bug #213454) and imagemagick dependency. reorder the deps

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 7e81ed34a5cca79f7b843fc8cd4a8fc149d5ba7a..c64ebec76ccdd10e29a762e17239b13ed441f04b 100644 (file)
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST inkscape-0.45.1.tar.gz 13244235 RMD160 f21d43196a1fbaddc4f4baa2a51a5d085ceb20e4 SHA1 f3df9eafc0fdfcc5f5024ea4bec4d7c477698380 SHA256 0d4c6277a599a3d18182e1947d8cf50805f06023b2a574a350c64286ea4a0bf8
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
 EBUILD inkscape-0.45.1-r1.ebuild 2259 RMD160 caffa235f87bbe74a768571bc28bc501ab8e71cc SHA1 362a4f735ed56cf0948d7abfc53323507f19b73a SHA256 665acaa94dea9cfcdb320b9defdf2f8936117b9e06f76e4a4fdec70cfe9bad2a
-EBUILD inkscape-0.46.ebuild 2300 RMD160 52c13fc503e32a7a607669353096087552db3024 SHA1 1f0774aecc9e6a941e2b1356adfe9508cb328a88 SHA256 49b379f6e402c7b8a0ea98e4bd70c9b862ea78fbc5c685d7b055415b21c6fd24
-MISC ChangeLog 10748 RMD160 16c675ec32ee9ee67c098e077069b6a1dc41d9df SHA1 cb0884405d2a817ffd664f821c3a75769bc4c1ab SHA256 827e5301ea996bfb41b6deeb52694b7182ab733aff3781a0833c74b818aeca9d
+EBUILD inkscape-0.46.ebuild 2618 RMD160 4474f41c7385a2ce1e02e582d4f1850c0cabdf1b SHA1 2c8231bca1bcb0716a8378bafd37339162b5e519 SHA256 29277b753db0b442b2810678c750be2130655ad263d605227c44429ec6c0a938
+MISC ChangeLog 10872 RMD160 9143633ef78ea5d5f6b284b60d1f73ec9d9b6a01 SHA1 d99a1f69a910381f65be66838c9820acd6abb85d SHA256 dbb3afed344027679bf3f4926bbd9d6aa4a3a0ac203101d4f71434137f010c21
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH25tzkKaRLQcq0GIRAlPMAJ9ukraBKlAC9byZhFymbNnljuU34QCfUKdE
-DAv6W+wNbJiGE70IXUwZ0Jo=
-=qCkk
+iD8DBQFH3AArkKaRLQcq0GIRAtE1AJ4yprwIQFOPtR8TnZcRkAFc/wUjggCghFyZ
+NKvHWt0rprzAgxD2QakhHdE=
+=C3NA
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/inkscape/inkscape-0.46.ebuild b/media-gfx/inkscape/inkscape-0.46.ebuild
index 408d3cbb43fd88f5ae238cf4c2084fdac39bc39d..3a7b08b6a3579e950e07fe1b0c4e91e0116b4562 100644 (file)
--- a/media-gfx/inkscape/inkscape-0.46.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46.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/inkscape/inkscape-0.46.ebuild,v 1.2 2008/03/15 09:47:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46.ebuild,v 1.3 2008/03/15 16:57:04 maekke Exp $
 
 inherit gnome2 eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
+IUSE="dia doc gnome inkjar jabber lcms mmx pdf perl postscript spell wmf"
 RESTRICT="test"
 
 COMMON_DEPEND="
@@ -38,6 +38,7 @@ COMMON_DEPEND="
                gnome-base/libgnomeprintui
        )
        lcms? ( >=media-libs/lcms-1.14 )
+       pdf? ( app-text/poppler-bindings )
        perl? (
                dev-perl/XML-Parser
                dev-perl/XML-XQL
@@ -67,6 +68,11 @@ pkg_setup() {
                eerror "you need to emerge media-gfx/pstoedit with plotutils support."
                die "remerge media-gfx/pstoedit with USE=\"plotutils\""
        fi
+       # bug 213026
+       if use pdf && ! built_with_use app-text/poppler-bindings cairo ; then
+               eerror "you need to emerge app-text/poppler-bindings with cairo support."
+               die "remerge app-text/poppler-bindings with USE=\"cairo\""
+       fi
 
        G2CONF="${G2CONF} --with-xft"
        G2CONF="${G2CONF} $(use_with spell gtkspell)"
@@ -76,6 +82,7 @@ pkg_setup() {
        G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
        G2CONF="${G2CONF} $(use_with gnome gnome-print)"
        G2CONF="${G2CONF} $(use_enable lcms)"
+       G2CONF="${G2CONF} $(use_enable pdf poppler-cairo)"
        G2CONF="${G2CONF} $(use_with perl)"
 }