old

(Portage version: 2.2_rc62/cvs/Linux i686)

10 files changed, 10 insertions, 600 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 4bfd06eb43c7..d074f7048469 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.136 2010/02/07 16:02:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.137 2010/02/07 17:08:24 maekke Exp $
+
+  07 Feb 2010; Markus Meier <maekke@gentoo.org> -inkscape-0.46-r5.ebuild,
+  -files/inkscape-0.46-bug-174720-0.patch,
+  -files/inkscape-0.46-bug-174720-1.patch,
+  -files/inkscape-0.46-bug-214171.patch, -files/inkscape-0.46-gcc43.patch,
+  -files/inkscape-0.46-gcc44_p2.patch, -files/inkscape-0.46-gcc44.patch,
+  -files/inkscape-0.46-glibc2.10.patch,
+  -files/inkscape-0.46-poppler-0.8.3.patch:
+  old
 
   07 Feb 2010; Raúl Porcel <armin76@gentoo.org> inkscape-0.47.ebuild:
   sparc stable wrt #299480
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch
deleted file mode 100644
index 1a4d780f4787..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -pur inkscape-0.46.orig/src/style.cpp inkscape-0.46/src/style.cpp
---- inkscape-0.46.orig/src/style.cpp	2008-03-11 05:19:45.000000000 +0100
-+++ inkscape-0.46/src/style.cpp	2008-03-28 12:35:52.000000000 +0100
-@@ -2125,7 +2125,9 @@ static void
- sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
- {
-     if ((paint->set && paint->currentcolor) || parent->currentcolor) {
-+        bool isset = paint->set;
-         paint->clear();
-+        paint->set = isset;
-         paint->currentcolor = TRUE;
-         paint->setColor(style->color.value.color);
-         return;
-@@ -3001,6 +3003,7 @@ sp_style_read_icolor(SPIPaint *paint, gc
-         guint32 const rgb0 = sp_svg_read_color(str, 0xff);
-         if (rgb0 != 0xff) {
-             paint->setColor(rgb0);
-+            paint->set = TRUE;
-             paint->inherit = FALSE;
-         }
-     }
-Only in inkscape-0.46/src: style.cpp~
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch
deleted file mode 100644
index 1d6b8e4ed4af..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -pur --exclude='*~' inkscape-0.46.p1/src/style.cpp inkscape-0.46/src/style.cpp
---- inkscape-0.46.p1/src/style.cpp	2008-04-08 09:23:25.000000000 +0200
-+++ inkscape-0.46/src/style.cpp	2008-04-08 12:30:35.000000000 +0200
-@@ -3614,7 +3614,7 @@ sp_style_write_ipaint(gchar *b, gint con
-                 css << "currentColor";
-             }
- 
--            if ( paint->colorSet ) {
-+            if ( paint->colorSet && !paint->currentcolor ) {
-                 if ( !css.str().empty() ) {
-                     css << " ";
-                 }
-@@ -3623,7 +3623,7 @@ sp_style_write_ipaint(gchar *b, gint con
-                 css << color_buf;
-             }
- 
--            if (paint->value.color.icc) {
-+            if (paint->value.color.icc && !paint->currentcolor) {
-                 if ( !css.str().empty() ) {
-                     css << " ";
-                 }
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch
deleted file mode 100644
index 2a6bfe7be17b..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -pur --exclude='*~' inkscape-0.46.p2/src/style.cpp inkscape-0.46/src/style.cpp
---- inkscape-0.46.p2/src/style.cpp	2008-04-08 22:46:34.000000000 +0200
-+++ inkscape-0.46/src/style.cpp	2008-04-08 23:29:29.000000000 +0200
-@@ -1582,7 +1582,7 @@ sp_style_merge_paint_prop_from_dying_par
-      * I haven't given this much attention.  See comments below about
-      * currentColor, colorProfile, and relative URIs.
-      */
--    if (!child.set || child.inherit || child.currentcolor) {
-+    if (!child.set || child.inherit) {
-         sp_style_merge_ipaint(style, &child, &parent);
-         child.set = parent.set;
-         child.inherit = parent.inherit;
-@@ -2142,6 +2142,8 @@ sp_style_merge_ipaint(SPStyle *style, SP
-         }
-     } else if ( parent->isColor() ) {
-         paint->setColor( parent->value.color );
-+    } else if ( parent->isNoneSet() ) {
-+        paint->noneSet = TRUE;
-     } else if ( parent->isNone() ) {
-         //
-     } else {
diff --git a/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch
deleted file mode 100644
index a72af077eb5c..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur src.old/dom/dom.h src/dom/dom.h
---- src.old/dom/dom.h	2008-03-29 16:56:05.000000000 +0100
-+++ src/dom/dom.h	2008-03-29 17:14:30.000000000 +0100
-@@ -30,6 +30,7 @@
-  */
- 
- #include <vector>
-+#include <cstring>
- 
- //# include this before the #ifdefs below
- #include "domconfig.h"
diff --git a/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
deleted file mode 100644
index 5a7369c0c871..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff -Naur inkscape-0.46-orig/src/2geom/sbasis-math.cpp inkscape-0.46/src/2geom/sbasis-math.cpp
---- inkscape-0.46-orig/src/2geom/sbasis-math.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/2geom/sbasis-math.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -38,11 +38,11 @@
- //#define ZERO 1e-3
- 
- 
--namespace Geom {
-+#include <math.h>
-+#include <cstdio>
- 
-+namespace Geom {
- 
--#include <stdio.h>
--#include <math.h>
- 
- //-|x|-----------------------------------------------------------------------
- Piecewise<SBasis> abs(SBasis const &f){
-diff -Naur inkscape-0.46-orig/src/2geom/svg-path-parser.h inkscape-0.46/src/2geom/svg-path-parser.h
---- inkscape-0.46-orig/src/2geom/svg-path-parser.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/2geom/svg-path-parser.h	2009-04-05 18:21:30.000000000 -0400
-@@ -32,6 +32,7 @@
- #ifndef SEEN_SVG_PATH_PARSER_H
- #define SEEN_SVG_PATH_PARSER_H
- 
-+#include <cstdio>
- #include <vector>
- #include <iterator>
- #include <stdexcept>
-diff -Naur inkscape-0.46-orig/src/dom/domimpl.cpp inkscape-0.46/src/dom/domimpl.cpp
---- inkscape-0.46-orig/src/dom/domimpl.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/domimpl.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -30,6 +30,8 @@
- 
- #include "domimpl.h"
- 
-+#include <cstdio>
-+
- namespace org
- {
- namespace w3c
-diff -Naur inkscape-0.46-orig/src/dom/io/domstream.h inkscape-0.46/src/dom/io/domstream.h
---- inkscape-0.46-orig/src/dom/io/domstream.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/io/domstream.h	2009-04-05 18:21:30.000000000 -0400
-@@ -33,6 +33,8 @@
- 
- #include <dom/dom.h>
- 
-+#include <cstdio>
-+
- namespace org
- {
- namespace w3c
-diff -Naur inkscape-0.46-orig/src/dom/io/socket.h inkscape-0.46/src/dom/io/socket.h
---- inkscape-0.46-orig/src/dom/io/socket.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/io/socket.h	2009-04-05 18:34:14.000000000 -0400
-@@ -29,6 +29,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include <cstdio>
- #include "dom/dom.h"
- 
- #ifdef HAVE_SSL
-diff -Naur inkscape-0.46-orig/src/dom/io/stringstream.h inkscape-0.46/src/dom/io/stringstream.h
---- inkscape-0.46-orig/src/dom/io/stringstream.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/io/stringstream.h	2009-04-05 18:22:50.000000000 -0400
-@@ -29,7 +29,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
--
-+#include <cstdio>
- #include "domstream.h"
- 
- 
-diff -Naur inkscape-0.46-orig/src/dom/svg/svgtypes.h inkscape-0.46/src/dom/svg/svgtypes.h
---- inkscape-0.46-orig/src/dom/svg/svgtypes.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/svg/svgtypes.h	2009-04-05 18:21:30.000000000 -0400
-@@ -47,6 +47,7 @@
- #include "dom/smil.h"
- 
- 
-+#include <cstdio>
- #include <math.h>
- 
- 
-diff -Naur inkscape-0.46-orig/src/dom/xpathtoken.h inkscape-0.46/src/dom/xpathtoken.h
---- inkscape-0.46-orig/src/dom/xpathtoken.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/dom/xpathtoken.h	2009-04-05 18:21:30.000000000 -0400
-@@ -35,6 +35,7 @@
- 
- #include <math.h>
- 
-+#include <cstdio>
- #include <vector>
- 
- namespace org
-diff -Naur inkscape-0.46-orig/src/io/inkscapestream.h inkscape-0.46/src/io/inkscapestream.h
---- inkscape-0.46-orig/src/io/inkscapestream.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/io/inkscapestream.h	2009-04-05 18:21:30.000000000 -0400
-@@ -12,6 +12,7 @@
-  */
- 
- 
-+#include <cstdio>
- #include <glibmm.h>
- 
- namespace Inkscape
-diff -Naur inkscape-0.46-orig/src/io/sys.cpp inkscape-0.46/src/io/sys.cpp
---- inkscape-0.46-orig/src/io/sys.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/io/sys.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -22,6 +22,8 @@
- #include <glibmm/ustring.h>
- #include <gtk/gtkmessagedialog.h>
- 
-+#include <cstdio>
-+
- #include "prefs-utils.h"
- #include "sys.h"
- 
-diff -Naur inkscape-0.46-orig/src/libavoid/vertices.h inkscape-0.46/src/libavoid/vertices.h
---- inkscape-0.46-orig/src/libavoid/vertices.h	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/libavoid/vertices.h	2009-04-05 18:21:30.000000000 -0400
-@@ -23,6 +23,7 @@
- #ifndef AVOID_VERTICES_H
- #define AVOID_VERTICES_H
- 
-+#include <cstdio>
- #include <list>
- #include <set>
- #include <map>
-diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp inkscape-0.46/src/libnr/nr-matrix-fns.cpp
---- inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -1,5 +1,7 @@
- #include <libnr/nr-matrix-fns.h>
- 
-+#include <cstdio>
-+
- namespace NR {
- 
- Matrix elliptic_quadratic_form(Matrix const &m) {
-diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix.cpp inkscape-0.46/src/libnr/nr-matrix.cpp
---- inkscape-0.46-orig/src/libnr/nr-matrix.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/libnr/nr-matrix.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -11,6 +11,7 @@
-  * This code is in public domain
-  */
- 
-+#include <cstdio>
- #include <cstdlib>
- #include "nr-matrix.h"
- 
-diff -Naur inkscape-0.46-orig/src/streams-handles.cpp inkscape-0.46/src/streams-handles.cpp
---- inkscape-0.46-orig/src/streams-handles.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/streams-handles.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -12,6 +12,7 @@
- #include "streams-handles.h"
- #include "uri.h"
- 
-+#include <cstdio>
- #include <iostream>
- 
- namespace Inkscape {
-diff -Naur inkscape-0.46-orig/src/streams-zlib.cpp inkscape-0.46/src/streams-zlib.cpp
---- inkscape-0.46-orig/src/streams-zlib.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/streams-zlib.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -9,6 +9,7 @@
-  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
-  */
- 
-+#include <cstdio>
- #include <cstring>
- #include <string>
- #include <string.h>
-diff -Naur inkscape-0.46-orig/src/xml/event.cpp inkscape-0.46/src/xml/event.cpp
---- inkscape-0.46-orig/src/xml/event.cpp	2009-04-05 16:47:42.000000000 -0400
-+++ inkscape-0.46/src/xml/event.cpp	2009-04-05 18:21:30.000000000 -0400
-@@ -14,6 +14,7 @@
-  */
- 
- #include <glib.h> // g_assert()
-+#include <cstdio>
- 
- #include "event.h"
- #include "event-fns.h"
-
diff --git a/media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch b/media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch
deleted file mode 100644
index 0d2fcd4619cb..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
---- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44	2009-01-28 22:12:57.000000000 +0100
-+++ inkscape/src/extension/internal/bitmap/imagemagick.cpp	2009-03-02 17:05:57.000000000 +0100
-@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
- 	char *search = (char *) g_strndup(xlink, 30);
- 	if (strstr(search, "base64") != (char*)NULL) {
- 		// 7 = strlen("base64") + strlen(",")
--		char* pureBase64 = strstr(xlink, "base64") + 7;		
-+		const char* pureBase64 = strstr(xlink, "base64") + 7;		
- 		Magick::Blob blob;
- 		blob.base64(pureBase64);
- 		image->read(blob);
-diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
---- inkscape/src/libnr/nr-object.cpp.gcc44	2009-03-02 17:06:46.000000000 +0100
-+++ inkscape/src/libnr/nr-object.cpp	2009-03-02 17:06:58.000000000 +0100
-@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
-     );
-     memset(object, 0xf0, c->isize);
- 
--    object->klass = c;
-     c->cpp_ctor(object);
-+    object->klass = c;
-     nr_class_tree_object_invoke_init (c, object);
- 
-     return object;
diff --git a/media-gfx/inkscape/files/inkscape-0.46-glibc2.10.patch b/media-gfx/inkscape/files/inkscape-0.46-glibc2.10.patch
deleted file mode 100644
index 376fe5994384..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-glibc2.10.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -ru src/dialogs/export.cpp src/dialogs/export.cpp
---- src/dialogs/export.cpp	2009-05-25 02:21:18.067302917 +0300
-+++ src/dialogs/export.cpp	2009-05-25 02:21:17.804059091 +0300
-@@ -20,6 +20,9 @@
- # include "config.h"
- #endif
-
-+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
-+#include <png.h>
-+
- #include <gtk/gtk.h>
- #include <gtkmm/box.h>
- #include <gtkmm/buttonbox.h>
-@@ -60,7 +63,6 @@
- #include "io/sys.h"
-
- #include "helper/png-write.h"
--#include <png.h>
-
-
- #define SP_EXPORT_MIN_SIZE 1.0
-@@ -1041,9 +1043,7 @@
- static gchar *
- filename_add_extension (const gchar *filename, const gchar *extension)
- {
--  gchar *dot;
--
--  dot = strrchr (filename, '.');
-+  const gchar *dot = strrchr (filename, '.');
-   if ( !dot )
-     return g_strconcat (filename, ".", extension, NULL);
-   {
-diff -ru src/document.cpp src/document.cpp
---- src/document.cpp	2009-05-25 02:21:18.052299751 +0300
-+++ src/document.cpp	2009-05-25 02:21:17.797058619 +0300
-@@ -746,7 +746,7 @@
-         }
-
-         if ( NULL != document_language ) {
--            gchar *pos = strchr(document_language, '_');
-+	    const char *pos = strchr(document_language, '_');
-             if ( NULL != pos ) {
-                 return Glib::ustring(document_language, pos - document_language);
-             }
-diff -ru src/dom/io/domstream.cpp src/dom/io/domstream.cpp
---- src/dom/io/domstream.cpp	2009-05-25 02:21:18.011048623 +0300
-+++ src/dom/io/domstream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -34,6 +34,7 @@
-  *
-  */
-
-+#include <cstdio>
- #include <math.h>
- #include <stdarg.h>
-
-diff -ru src/dom/io/gzipstream.cpp src/dom/io/gzipstream.cpp
---- src/dom/io/gzipstream.cpp	2009-05-25 02:21:18.012048750 +0300
-+++ src/dom/io/gzipstream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -29,6 +29,8 @@
-
- #include "gzipstream.h"
-
-+#include <cstdio>
-+
- #include "dom/util/ziptool.h"
-
-
-diff -ru src/dom/io/socket.cpp src/dom/io/socket.cpp
---- src/dom/io/socket.cpp	2009-05-25 02:21:18.011048623 +0300
-+++ src/dom/io/socket.cpp	2009-05-25 02:21:17.754336705 +0300
-@@ -35,6 +35,7 @@
- #include <sys/filio.h>   // needed on Solaris 8
- #endif
-
-+#include <cstdio>
- #include "socket.h"
- #include "dom/util/thread.h"
-
-diff -ru src/dom/io/uristream.cpp src/dom/io/uristream.cpp
---- src/dom/io/uristream.cpp	2009-05-25 02:21:18.012048750 +0300
-+++ src/dom/io/uristream.cpp	2009-05-25 02:21:17.755301212 +0300
-@@ -41,6 +41,7 @@
-
-
- #include "uristream.h"
-+#include <cstdio>
-
-
-
-diff -ru src/dom/lsimpl.cpp src/dom/lsimpl.cpp
---- src/dom/lsimpl.cpp	2009-05-25 02:21:18.014048586 +0300
-+++ src/dom/lsimpl.cpp	2009-05-25 02:21:17.760050211 +0300
-@@ -33,6 +33,7 @@
- #include "lsimpl.h"
-
- #include <stdarg.h>
-+#include <cstdio>
-
- namespace org
- {
-diff -ru src/dom/svg/svgparser.cpp src/dom/svg/svgparser.cpp
---- src/dom/svg/svgparser.cpp	2009-05-25 02:21:18.014048586 +0300
-+++ src/dom/svg/svgparser.cpp	2009-05-25 02:21:17.759333709 +0300
-@@ -32,6 +32,7 @@
- #include "dom/cssparser.h"
- #include "dom/charclass.h"
-
-+#include <cstdio>
- #include <stdarg.h>
-
- #define SVG_NAMESPACE "http://www.w3.org/2000/svg"
-diff -ru src/main.cpp src/main.cpp
---- src/main.cpp	2009-05-25 02:21:18.069308689 +0300
-+++ src/main.cpp	2009-05-25 02:21:17.810107556 +0300
-@@ -28,6 +28,9 @@
- #endif
- #include "path-prefix.h"
-
-+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
-+#include <png.h>
-+
- #include <gtk/gtkmessagedialog.h>
-
- #ifdef HAVE_IEEEFP_H
-@@ -111,7 +114,6 @@
-
- #include "main-cmdlineact.h"
-
--#include <png.h>
- #include <errno.h>
-
- enum {
-diff -ru src/prefix.cpp src/prefix.cpp
---- src/prefix.cpp	2009-05-25 02:21:18.037083918 +0300
-+++ src/prefix.cpp	2009-05-25 02:21:17.787058605 +0300
-@@ -355,7 +355,8 @@
- char *
- br_extract_dir (const char *path)
- {
--	char *end, *result;
-+	const char *end;
-+	char *result;
-
- 	br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
-
-@@ -390,7 +391,8 @@
- char *
- br_extract_prefix (const char *path)
- {
--	char *end, *tmp, *result;
-+	const char *end;
-+	char *tmp, *result;
-
- 	br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
-
-diff -ru src/sp-image.cpp src/sp-image.cpp
---- src/sp-image.cpp	2009-05-25 02:21:18.023053851 +0300
-+++ src/sp-image.cpp	2009-05-25 02:21:17.777050418 +0300
-@@ -17,6 +17,9 @@
- # include "config.h"
- #endif
-
-+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
-+#include <png.h>
-+
- #include <cstring>
- #include <string>
- #include <libnr/nr-matrix-fns.h>
-@@ -41,7 +44,6 @@
- #include "libnr/nr-matrix-fns.h"
-
- #include "io/sys.h"
--#include <png.h>
- #if ENABLE_LCMS
- #include "color-profile-fns.h"
- #include "color-profile.h"
-
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
deleted file mode 100644
index 70f9a16abd4c..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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-r5.ebuild b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
deleted file mode 100644
index c8db76830633..000000000000
--- a/media-gfx/inkscape/inkscape-0.46-r5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.16 2009/12/07 11:18:43 maekke Exp $
-
-EAPI=2
-inherit eutils gnome2
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=virtual/poppler-glib-0.8.3[cairo]
-	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
-	media-gfx/imagemagick
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/libpng
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7
-	>=x11-libs/pango-1.4.0
-	|| ( dev-lang/python[xml] dev-python/pyxml )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	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[plotutils] 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() {
-	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_enable lcms)"
-	G2CONF="${G2CONF} $(use_with perl)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-gcc44_p2.patch
-	epatch "${FILESDIR}"/${P}-glibc2.10.patch
-	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
-	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
-	epatch "${FILESDIR}"/${P}-bug-174720-1.patch
-	epatch "${FILESDIR}"/${P}-bug-214171.patch
-
-	gnome2_src_prepare
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"