Bump to -r3 and patch for bug 224883, poppler-0.8.3 compat

Package-Manager: portage-2.1.5.3

5 files changed, 153 insertions, 15 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 1991f167bc0c..670c32a48394 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,13 @@
 # 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.100 2008/05/28 19:24:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.101 2008/06/04 23:50:29 loki_val Exp $
+
+*inkscape-0.46-r3 (04 Jun 2008)
+
+  04 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/inkscape-0.46-poppler-0.8.3.patch, inkscape-0.46-r2.ebuild,
+  +inkscape-0.46-r3.ebuild:
+  Bump to -r3 and patch for bug 224883
 
   28 May 2008; Markus Meier <maekke@gentoo.org> -inkscape-0.45.1-r1.ebuild:
   old
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3ea7db371aca..44db6e7b428a 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
+AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
-EBUILD inkscape-0.46-r2.ebuild 2655 RMD160 282d6bd4d19eec6b0faaae324b91841024a8df0d SHA1 ac00764b2488450c97590de974f15f87b097dfe9 SHA256 3a7f8d7652b0d5099763a03da9e8bb1090a74ad9975197cbd089310da5009e0d
-MISC ChangeLog 12939 RMD160 1425c8ad9250053c4dda33770fff0e523b150360 SHA1 fd8064b4e9a996f155144b0a07d8f5f76bd21b00 SHA256 f0614dc2c2c7b0a52e70952efd36c615f7928e7367b560f3361d7004a1050ff9
+EBUILD inkscape-0.46-r2.ebuild 2663 RMD160 98a8e8beb79c00229206c91b577974bef8bc03f4 SHA1 4f4c85fbf5c2783f7cb3a2375966ccd39763a20c SHA256 4fec98bc259390da87633972e0a9e61a5a820f82fb9d9b54f2a81a057f5dc4e2
+EBUILD inkscape-0.46-r3.ebuild 2717 RMD160 192c76c96fc23abbf7c3351d5dfa00865fe15c19 SHA1 29e2da85a080d2de136209d529ef927672777125 SHA256 86dbdbea7ce29fac3abf3f2267ecce6cf098838a41f153022ab76ab81930c60d
+MISC ChangeLog 13164 RMD160 94dbeb6896145b2067df62d3f3b71284b76df53a SHA1 f2576d599b8944c76ddf5420d0b87675980d885f SHA256 7e472d4324d8ed9c865fb7f5eccb798032e7da9475f7587fa26810dd23230a08
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg9saoACgkQkKaRLQcq0GLvfwCfa6iYcewFnO7c0pv3QHg/50u2
-MTYAmgOwdNe0it9qNAoi/nVYZqIHqYka
-=XMld
------END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch b/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
new file mode 100644
index 000000000000..70f9a16abd4c
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
@@ -0,0 +1,42 @@
+diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
++++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:51:47.000000000 +0200
+@@ -2194,11 +2194,11 @@
+ void PdfParser::doShowText(GooString *s) {
+   GfxFont *font;
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+-  Unicode u[8];
++  Unicode *u = NULL;
+   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+   double *mat;
+   Object charProc;
+@@ -2242,11 +2242,11 @@
+     oldParser = parser;
+     p = s->getCString();
+     len = s->getLength();
+     while (len > 0) {
+       n = font->getNextChar(p, len, &code,
+-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++			    &u, &uLen,
+ 			    &dx, &dy, &originX, &originY);
+       dx = dx * state->getFontSize() + state->getCharSpace();
+       if (n == 1 && *p == ' ') {
+ 	dx += state->getWordSpace();
+       }
+@@ -2291,11 +2291,11 @@
+     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+     p = s->getCString();
+     len = s->getLength();
+     while (len > 0) {
+       n = font->getNextChar(p, len, &code,
+-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++			    &u, &uLen,
+ 			    &dx, &dy, &originX, &originY);
+       
+       if (wMode) {
+ 	dx *= state->getFontSize();
+ 	dy = dy * state->getFontSize() + state->getCharSpace();
diff --git a/media-gfx/inkscape/inkscape-0.46-r2.ebuild b/media-gfx/inkscape/inkscape-0.46-r2.ebuild
index 06f1c68c8ecf..7e6cbe33ab51 100644
--- a/media-gfx/inkscape/inkscape-0.46-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r2.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-r2.ebuild,v 1.7 2008/05/26 15:31:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r2.ebuild,v 1.8 2008/06/04 23:50:29 loki_val Exp $
 
 inherit gnome2 eutils
 
@@ -15,7 +15,7 @@ IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	app-text/poppler-bindings
+	<app-text/poppler-bindings-0.8.3
 	dev-cpp/glibmm
 	>=dev-cpp/gtkmm-2.10.0
 	>=dev-libs/boehm-gc-6.4
diff --git a/media-gfx/inkscape/inkscape-0.46-r3.ebuild b/media-gfx/inkscape/inkscape-0.46-r3.ebuild
new file mode 100644
index 000000000000..336661122a9c
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.46-r3.ebuild
@@ -0,0 +1,97 @@
+# 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-r3.ebuild,v 1.1 2008/06/04 23:50:29 loki_val Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+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"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-text/poppler-bindings-0.8.3
+	dev-cpp/glibmm
+	>=dev-cpp/gtkmm-2.10.0
+	>=dev-libs/boehm-gc-6.4
+	dev-libs/boost
+	>=dev-libs/glib-2.6.5
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml
+	dev-python/pyxml
+	media-gfx/imagemagick
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libpng
+	virtual/xft
+	>=x11-libs/gtk+-2.10.7
+	>=x11-libs/pango-1.4.0
+	gnome? (
+		>=gnome-base/gnome-vfs-2.0
+		gnome-base/libgnomeprint
+		gnome-base/libgnomeprintui
+	)
+	lcms? ( >=media-libs/lcms-1.14 )
+	perl? (
+		dev-perl/XML-Parser
+		dev-perl/XML-XQL
+	)
+	spell? ( app-text/gtkspell )"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/numpy
+	dia? ( app-office/dia )
+	postscript? ( >=media-gfx/pstoedit-3.44 media-gfx/skencil )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	x11-libs/libX11
+	>=dev-util/intltool-0.29"
+
+pkg_setup() {
+	# bug 207070
+	if use postscript && ! built_with_use media-gfx/pstoedit plotutils ; then
+		eerror "you need to emerge media-gfx/pstoedit with plotutils support."
+		die "remerge media-gfx/pstoedit with USE=\"plotutils\""
+	fi
+	# bug 213026 and bug 213706
+	if ! 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)"
+	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
+	G2CONF="${G2CONF} $(use_enable mmx)"
+	G2CONF="${G2CONF} $(use_with inkjar)"
+	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
+	G2CONF="${G2CONF} $(use_with gnome gnome-print)"
+	G2CONF="${G2CONF} $(use_enable lcms)"
+	G2CONF="${G2CONF} $(use_with perl)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"