old

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

8 files changed, 15 insertions, 545 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 178c38568065..5930f29e4f79 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.169 2011/10/21 16:47:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.170 2011/10/21 16:56:27 ssuominen Exp $
+
+  21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -inkscape-0.47.ebuild,
+  -files/inkscape-0.47-gcc45.patch, -files/inkscape-0.47-poppler.patch,
+  -inkscape-0.48.0.ebuild, -files/inkscape-0.48.0-libwpd.patch,
+  -files/inkscape-0.48.0-poppler-0.16.patch:
+  old
 
   21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> inkscape-0.48.2.ebuild:
   x86 stable wrt #387199
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index a84091e43ba6..2e10473ceb70 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX inkscape-0.47-gcc45.patch 4797 RMD160 c6f254b0b2bc1f7ae0e29a6952b9f13516385fc8 SHA1 68f66a3c152e1b472f9505dbac354f86a9059ee3 SHA256 49834c862d145c88d82ea016b0c6a274cf935c10d80bd2aefe45c4a8336d214f
-AUX inkscape-0.47-poppler.patch 3733 RMD160 6fad5479d59f1742216fe673e80dac2b420f768e SHA1 de0d3ab2b55bc0c63ef725bad90bd78258b76bc5 SHA256 43f0e3202e179599719e1a857ae319e332dad082bd8ab64c686a00979174c000
-AUX inkscape-0.48.0-libwpd.patch 1444 RMD160 f5b63be882b6e6757fab8994ad6ade5a6e8e5b44 SHA1 bcf8d143f29e3b1ff3281065a374c9ae1beb276c SHA256 a364a8e302a9d9ff022333c101478755d5bfd262d7ace65619809b3210287547
-AUX inkscape-0.48.0-poppler-0.16.patch 2643 RMD160 31ca9704d9df32d9534acace96889782ad4b7e13 SHA1 c3f1821740ed638d2de886a4e7825962c947ac89 SHA256 7e240c3af06daa171c42f0dbca19e5ada05877c8127c7be9129804e053a320c4
 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.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
-DIST inkscape-0.48.0.tar.gz 25870275 RMD160 0d97c17136fe69a2248bb4cf4d2f6296ce18c37f SHA1 220ade981069a91d3afab9cbff75f65c75119da2 SHA256 0812f6ca63aa7c4bb236c932a02bd4e0cb5209404bb42cff5f65ad0f84844176
 DIST inkscape-0.48.2.tar.bz2 19583331 RMD160 3f658d373f976a41191d48d8248b33dfb3d65238 SHA1 be30ab2d2714d04ddd69b400bd6ad30b09e83067 SHA256 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
-EBUILD inkscape-0.47.ebuild 2477 RMD160 1e126305c3c52353d2cc0daf2b048b64ade0e3dc SHA1 9e8b03848bd6db48e200661837d619711853c54a SHA256 3159f0fe64b1e807431cf1544706c00824d0699da7ef430bee0a94f460513bf9
-EBUILD inkscape-0.48.0.ebuild 2671 RMD160 162a3c939e3be3f4c5eefa048162d60306aca295 SHA1 eadfcbd2641de066acd5422dff29d8e0647f2e0f SHA256 c0b9822e803c460feee86b7d7e2351429b443e117d6d3a3521cfcb0e24f12f34
 EBUILD inkscape-0.48.2.ebuild 2550 RMD160 651a6a25f4c79f744eb9fc4bce131a2cba471352 SHA1 c6e65cc92266858d3410ad094ed928ea5d929400 SHA256 b775dc9f3b041ca22ceeb3b48a14f060e6faffe8b31fb9679995c130d7cb2fb8
-MISC ChangeLog 23739 RMD160 24d2f677f4fc0e69c3d9b79045cca0867f1b6b60 SHA1 58282ddb6d5761ef7c848e86332904dc0fa86bf1 SHA256 a8a4a15d1b236320664c2e3ece9f1d68c047b9eca5cea37c120cd4c1ead28cc3
+MISC ChangeLog 24004 RMD160 db895eba25d99dcfd664c0601c12329c79f0e18a SHA1 ce98b13e42e8bac7b010080ff046bbc3401558eb SHA256 1f98cbe3b286a9d11c11fc852c3c76527459ab1fb4b1e074ef4f696c7a23cc61
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOoaIbAAoJEEdUh39IaPFNUeEIAIiuTC13dJi4W49irsmCaxqx
-hZIGhc9UmnBIS3IMfQj5CE0GPqZRwA6S2wVDtWX5vm/yFpNE/1U9LJ3Hw4iVu/Ah
-IOztsE54RziqP7KU3QqK5KsWkqCxGBWt2VHFX0481at5rmrikbcRkdXKYVFe5gcj
-OKfY59+wWgVomg94JGRanmep6J4ZQbgew6ioc+mCjQnbOJyyg6tuf2Oo4Qf3BcXQ
-+yqsNRrB94txMTy0GX7fYI3SFbwtpWdJ4jpjVxRjPEsIKpEWgk0CeYCqkcRZjIZJ
-9KEdRY6xInNmGOwF7h8txSi8cVUpLe1J0OIs2GioG+Nvx5ZRcXHS5kghiiGW6vA=
-=XyXN
+iQEcBAEBAgAGBQJOoaQXAAoJEEdUh39IaPFNz1QH/0xmc2rfrwo0v87XOeqzpbca
+uQnWedp9zhwWnFCsX4XQRNYHyRSioN2TPavU7wnARlIfqKHfH7IGkhsPZtV8Ie3/
+r5D3Kew+9ZMgoIRyqmZVn5SN0xAlvF7NpstJmktelCnrmySCP7Ra+S1olMBBQq9C
+2Ose+QYrDQ+e6TOtquK6QYmlYX9EkonYHo3t+TJ8dvqEa+H8hzJik/ih6E8WlTr2
+5eD3G63a5HubxYWr/zndNVebxhRrO39AjnFZUmciujcSYTFcTUWlLesZvQ7mWgNU
+zd/XSg5ZMy6qHu3o2v/MYNWI5GSdNupL9pgtFn+ASnLeEer4+PI18MN/8PBW7Go=
+=n7YW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.47-gcc45.patch b/media-gfx/inkscape/files/inkscape-0.47-gcc45.patch
deleted file mode 100644
index 643b7ff1d57b..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.47-gcc45.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=305749
-
-diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
---- inkscape-0.47-orig/src/eraser-context.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/eraser-context.cpp	2010-02-18 08:46:26.000000000 -0500
-@@ -749,7 +749,7 @@
-                 if ( eraserMode ) {
-                     toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
-                 } else {
--                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-                     toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
-                 }
-                 toWorkOn = g_slist_remove( toWorkOn, acid );
-diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
---- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp	2010-02-18 09:07:54.000000000 -0500
-@@ -161,7 +161,7 @@
- 	mywriter writer;
- 	sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
- 
--    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
-+    Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
- 	g_free(xml_str);
-     return;
- }
-diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
---- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/extension/internal/filter/filter.cpp	2010-02-18 09:21:06.000000000 -0500
-@@ -217,7 +217,7 @@
-                 "<menu-tip>%s</menu-tip>\n"
-             "</effect>\n"
-         "</inkscape-extension>\n", name, id, submenu, tip);
--    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
-+    Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
- 	g_free(xml_str);
-     return;
- }
-diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
---- inkscape-0.47-orig/src/flood-context.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/flood-context.cpp	2010-02-18 08:48:16.000000000 -0500
-@@ -900,7 +900,7 @@
-     if (is_point_fill) {
-         fill_points.push_back(Geom::Point(event->button.x, event->button.y));
-     } else {
--        Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+        Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-         fill_points = r->getPoints();
-     }
- 
-@@ -1206,7 +1206,7 @@
- 
-     case GDK_BUTTON_RELEASE:
-         if (event->button.button == 1 && !event_context->space_panning) {
--            Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+            Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-             if (r->is_started()) {
-                 // set "busy" cursor
-                 desktop->setWaitingCursor();
-diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
---- inkscape-0.47-orig/src/gradient-context.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/gradient-context.cpp	2010-02-18 08:47:33.000000000 -0500
-@@ -641,7 +641,7 @@
-                 if (!event_context->within_tolerance) {
-                     // we've been dragging, either do nothing (grdrag handles that),
-                     // or rubberband-select if we have rubberband
--                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-                     if (r->is_started() && !event_context->within_tolerance) {
-                         // this was a rubberband drag
-                         if (r->getMode() == RUBBERBAND_MODE_RECT) {
-diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
---- inkscape-0.47-orig/src/select-context.cpp	2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/select-context.cpp	2010-02-18 08:50:11.000000000 -0500
-@@ -602,7 +602,7 @@
-                     }
-                     sc->item = NULL;
-                 } else {
--                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-                     if (r->is_started() && !within_tolerance) {
-                         // this was a rubberband drag
-                         GSList *items = NULL;
diff --git a/media-gfx/inkscape/files/inkscape-0.47-poppler.patch b/media-gfx/inkscape/files/inkscape-0.47-poppler.patch
deleted file mode 100644
index 304ecc8e0dc5..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.47-poppler.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Fix Rawhide build (more recent poppler)
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-
-Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
-===================================================================
---- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(revision 22620)
-+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(working copy)
-@@ -56,6 +56,13 @@
- #define M_PI 3.14159265358979323846
- #endif
- 
-+#include <glib/poppler-features.h>
-+#if POPPLER_CHECK_VERSION(0,12,2)
-+#define PGFX ,NULL
-+#else
-+#define PGFX
-+#endif
-+
- //------------------------------------------------------------------------
- // constants
- //------------------------------------------------------------------------
-@@ -809,7 +816,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -1009,9 +1016,9 @@
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj PGFX);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1032,9 +1039,9 @@
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj PGFX);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1101,7 +1108,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1145,7 +1152,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1543,7 +1550,7 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--  if (!(shading = res->lookupShading(args[0].getName()))) {
-+  if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
-     return;
-   }
- 
-@@ -2507,7 +2514,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--      colorSpace = GfxColorSpace::parse(&obj1);
-+      colorSpace = GfxColorSpace::parse(&obj1 PGFX);
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2592,7 +2599,7 @@
- 	  obj2.free();
- 	}
-       }
--      maskColorSpace = GfxColorSpace::parse(&obj1);
-+      maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2767,7 +2774,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch b/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
deleted file mode 100644
index 94b317f57ae1..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- inkscape-0.48.0/configure.ac
-+++ inkscape-0.48.0/configure.ac
-@@ -678,7 +678,7 @@
- dnl Check for libwpg for extension
- dnl ******************************
- 
--PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
-+PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no)
- if test "x$with_libwpg" = "xyes"; then
- 	AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
- fi
---- inkscape-0.48.0/src/extension/internal/wpg-input.cpp
-+++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp
-@@ -49,7 +49,7 @@
- #include "document.h"
- 
- #include "libwpg/libwpg.h"
--#include "libwpg/WPGStreamImplementation.h"
-+#include "libwpd-stream/libwpd-stream.h"
- 
- 
- using namespace libwpg;
-@@ -61,9 +61,9 @@
- 
- SPDocument *
- WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
--    WPXInputStream* input = new libwpg::WPGFileStream(uri);
-+    WPXInputStream* input = new WPXFileStream(uri);
-     if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream();
-+        WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
-         if (olestream) {
-             delete input;
-             input = olestream;
-@@ -78,7 +78,7 @@
-         return NULL;
-     }
- 
--    libwpg::WPGString output;
-+    WPXString output;
-     if (!libwpg::WPGraphics::generateSVG(input, output)) {
-         delete input;
-         return NULL;
-
-
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch b/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch
deleted file mode 100644
index 25327d9d1736..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-=== modified file 'configure.ac'
---- configure.ac	2010-11-15 01:32:59 +0000
-+++ configure.ac	2010-11-21 12:38:01 +0000
-@@ -611,11 +611,12 @@
- 	AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
- fi
- 
--AC_MSG_CHECKING(for new color space API in Poppler)
- ink_svd_CPPFLAGS=$CPPFLAGS
- ink_svd_LIBS=$LIBS
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- LIBS="$LIBS $POPPLER_LIBS"
-+
-+AC_MSG_CHECKING(for new color space API in Poppler)
- popplercolor="no"
- AC_COMPILE_IFELSE([
- #include <GfxState.h>
-@@ -627,16 +628,36 @@
-   return 0;
- }
- ], [popplercolor=yes])
-+if test "x$popplercolor" = "xyes"; then
-+	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
-+	AC_MSG_RESULT(yes)
-+else
-+	AC_MSG_RESULT(no)
-+fi
-+
-+# Poppler's b604a008 commit changes this
-+AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
-+popplergfxcolor="no"
-+AC_COMPILE_IFELSE([
-+#include <GfxState.h>
-+
-+int main() {
-+  GfxPatch::ColorValue color = {c: {0}};
-+  GfxPatch patch;
-+  patch.color[[0]][[0]] = color;
-+  return 0;
-+}
-+], [popplergfxcolor=yes])
-+if test "x$popplergfxcolor" = "xyes"; then
-+	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
-+	AC_MSG_RESULT(yes)
-+else
-+	AC_MSG_RESULT(no)
-+fi
-+
- CPPFLAGS=$ink_svd_CPPFLAGS
- LIBS=$ink_svd_LIBS
- 
--if test "x$popplercolor" = "xyes"; then
--	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
--	AC_MSG_RESULT(yes)
--else
--	AC_MSG_RESULT(no)
--fi
--
- dnl ******************************
- dnl Inkboard dependency checking
- dnl ******************************
-
-=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
---- src/extension/internal/pdfinput/pdf-parser.cpp	2010-03-21 01:53:59 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp	2010-11-21 12:38:01 +0000
-@@ -1874,6 +1874,9 @@
- 
- void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
-   GfxPatch patch00, patch01, patch10, patch11;
-+#ifdef POPPLER_NEW_GFXPATCH
-+  GfxColor color;
-+#endif
-   double xx[4][8], yy[4][8];
-   double xxm, yym;
-   double patchColorDelta = colorDeltas[pdfPatchMeshShading-1];
-@@ -1890,9 +1893,16 @@
- 	  > patchColorDelta) {
-       break;
-     }
-+#ifdef POPPLER_NEW_GFXPATCH
-+    color.c[i] = GfxColorComp(patch->color[0][0].c[i]);
-+#endif
-   }
-   if (i == nComps || depth == maxDepths[pdfPatchMeshShading-1]) {
-+#ifdef POPPLER_NEW_GFXPATCH
-+    state->setFillColor(&color);
-+#else
-     state->setFillColor(&patch->color[0][0]);
-+#endif
-     state->moveTo(patch->x[0][0], patch->y[0][0]);
-     state->curveTo(patch->x[0][1], patch->y[0][1],
- 		   patch->x[0][2], patch->y[0][2],
-
diff --git a/media-gfx/inkscape/inkscape-0.47.ebuild b/media-gfx/inkscape/inkscape-0.47.ebuild
deleted file mode 100644
index c4e0c6dd700c..000000000000
--- a/media-gfx/inkscape/inkscape-0.47.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47.ebuild,v 1.16 2011/08/04 16:27:36 scarabeus Exp $
-
-EAPI=2
-inherit eutils flag-o-matic gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="dia gnome gs inkjar lcms mmx nls spell wmf"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0:2.4
-	>=dev-libs/boehm-gc-6.4
-	>=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-1.2
-	>=app-text/libwpg-0.1
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7:2
-	>=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* )
-	spell? (
-		app-text/aspell
-		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 )
-	gs? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-poppler.patch \
-		"${FILESDIR}"/${P}-gcc45.patch
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}
diff --git a/media-gfx/inkscape/inkscape-0.48.0.ebuild b/media-gfx/inkscape/inkscape-0.48.0.ebuild
deleted file mode 100644
index 94204f97f331..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.0.ebuild,v 1.13 2011/08/04 16:27:36 scarabeus Exp $
-
-EAPI=2
-inherit eutils flag-o-matic autotools gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 x86"
-IUSE="dia gnome gs inkjar lcms nls spell wmf"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-libs/boehm-gc-6.4
-	>=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-1.2
-	>=app-text/libwpg-0.1
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7:2
-	>=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* )
-	spell? (
-		app-text/aspell
-		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 )
-	gs? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	G2CONF="${G2CONF} $(use_with spell aspell)"
-	G2CONF="${G2CONF} $(use_with spell gtkspell)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-spell.patch
-
-	# Upstream commit:
-	# http://bazaar.launchpad.net/~inkscape.dev/inkscape/RELEASE_0_48_BRANCH/revision/9727
-	epatch "${FILESDIR}"/${P}-poppler-0.16.patch
-	eautoreconf
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}