media-gfx/inkscape: Backport fix for API changes in app-text/poppler-0.29.0, #534392

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 259 insertions, 11 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index c639eaac7048..595bcd4b0cad 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.219 2015/01/03 17:14:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.220 2015/01/06 09:57:11 jlec Exp $
+
+*inkscape-0.48.5-r1 (06 Jan 2015)
+
+  06 Jan 2015; Justin Lecher <jlec@gentoo.org> +inkscape-0.48.5-r1.ebuild,
+  +files/inkscape-0.48.4-poppler-0.29.0.patch, metadata.xml:
+  Backport fix for API changes in app-text/poppler-0.29.0, #534392
 
 *inkscape-0.91_pre3-r2 (03 Jan 2015)
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index a049fb8cb72e..8be7bc54c89b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
 AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92
 AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a
 AUX inkscape-0.48.4-automake-1.13.patch 408 SHA256 b08e8dd941ef6f9b836f21e1a2b6f1bde4ed9ec8c4e41a3c8c3592a5b0c2635c SHA512 1e63ba31537976bd3007db76d0ec20200d5d12af30723c57ca940381573c92f14707b7da67aad5eb74027171aa6fe421a1dfce8c7228803810b684e45b107008 WHIRLPOOL c3b23563a4f986ec7cdaea3b69d1fdf7c86482e88ca05a977b3f422a1079d0856bbe9017a6728d194827c1674c61c8982255b1804b29e8620cfcd1895b6b519e
 AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08aa444e45c32ccd564f6962304f3cdb SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 WHIRLPOOL 768acee72f3747fdb23a5bdf0665364a316c8b6d9abaa582a7d897153b38f271db25bc1a9c2d4893a45021f1098565dbedba77360add0d50404f2320cb134d87
 AUX inkscape-0.48.4-gc74-configure.patch 558 SHA256 1d378b0d90f2bde6469a040d61e3dbd8ecfcdf3b8c6c086b5dc8eb744918c20e SHA512 04254fcb2f910e73b30c85de5bed9009ec51dd8936eafa49909a90b8e7b44cdee79a73fca9d043a8659bbd551cc3db26f6dc9155849b6ff3df0d2f73bd4b163c WHIRLPOOL 5b74b3a9cea371f8ae862fba4c9848f13a4d450e1a253b789634b3bbe88df9d86e3e501da04805d3d755e613e8439d79c1ac7ff515a3693cafe615d62effe7c9
+AUX inkscape-0.48.4-poppler-0.29.0.patch 4869 SHA256 fd1e060cf52daebb790e27c23090f642107f69df2868deeafb87b7fb6959467e SHA512 17ca083632a01543f4bdb43500bb667bcafcdc273a298fef681853c8bde8ed5a13dc7d86c3554f08d5dffc4ab8397359f85adbf4f7818e5e50cd27789ed637be WHIRLPOOL 74fc24fb4eff9786767159fa6b47801ffcf24046665b670f8e936307eb14b80d3a4571acf9f47ef65c57a9fb1b303096ead68b714cfa95aa1c70f3f687f2c609
 AUX inkscape-0.91_pre3-automagic.patch 5281 SHA256 100b94eee2a9f5ffacafe0732735342cb14b873296de1e982e7db24ced31124e SHA512 badd58f08d1e3b4e84e8b18de23e08a1ad44b24367e05092629e7793b4c5f54653b3c47ec9189f1297d071cb3ac9cb098ca65aa16f79e5c3e0bb3a97ee5cc9a2 WHIRLPOOL 21ea0226ae352d6225e2065b74e3763b9feb71feb8c9bb072f46a5e7496eae619c42ac62cd560017f0cfb426993f7da5d157c3fc1562a397c90228c20a9d51ad
 AUX inkscape-0.91_pre3-cppflags.patch 493 SHA256 49596723efb606990e2131ba637567a2749add6a55505bc6bb6156d3c96ac087 SHA512 12253f89d51b2ad7610381aeba637d844c5ee2579eebc75aaad1791c87ef455a6a9a8dd1db5fc9e1adf51a928e8efe06946efc73e3743e209f970a457b397c35 WHIRLPOOL 037907d21ddc1234376188cf3837e5fd2d671fc7f3ad7c254489525b17e5de9f93485cecbb8c451a2e86b8adb3c8fe34a4d518c083854007f527741860375cc8
 AUX inkscape-0.91_pre3-desktop.patch 693 SHA256 016adfaddb1c6c509318430fab9d74ee81f5ce9f71a85ccb4b06d6dc221fff03 SHA512 036ddbe38cb2bb229a864ed43445d1b9a2b3a1ade882edf8f24aa2df10c317f60c6be3849470729a1dabe81282864fcfa6e6283b0df5cf0fdbc2f31f0c3bdc46 WHIRLPOOL cf4c975d042490b364fa1705c3fc6cdcbc838674831217a94876dc0ebdbca2fbe197e137b59acce91b2adf2daaaeb023ff3fadb5c62a456cc30b3b699cf8e413
@@ -12,8 +16,28 @@ AUX inkscape-0.91_pre3-poppler-0.29.patch 4312 SHA256 6e517e02fc43a0e9b4f4ccb5be
 AUX inkscape-0.91_pre3-sk-man.patch 362 SHA256 56e24d84d5217308df178d64214ec13c4b81ba59541cc6f52415f2207825a274 SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab WHIRLPOOL d92a002591b0c4c6dd898fd720827ef94d6f801fd025ad8bfd4eaddb262240fb9cbc84485087063485292a300a7411a21c1666de8a3f51178103720079f57eee
 DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284
 DIST inkscape-0.91pre3.tar.bz2 24817640 SHA256 2163e8e582bc072b84f2f178d1ac201aac41c22e51d3b48a129c0ff44eb50c55 SHA512 383363cf6d5add909ab6424a34a7b7ffefffc18d86c9015e706695b2933a223ffa5b8af7c0ad6fff99f9283fd069e9f5d57c0d4f759bcae380592e5c5b3a5445 WHIRLPOOL 30effd256174ad33ea99eb226008008b514305db090cfd27957ee4ca1f91f46c230f0b1fb3830ee29a5e629f390864da6348fe315f19361c5787ce288488bd05
+EBUILD inkscape-0.48.5-r1.ebuild 2944 SHA256 125591934f5276bf572746a3fa13e1617a9592079ecb99c410954cb6f8bac2fa SHA512 ffe85313a31940914556a03814f97032a68bb8bb3f433b24d0add8890725cc4a35dcc67ed0ffc7e0eed647296337158557dc3240bbbfff5d45f533708f11bf45 WHIRLPOOL 781469b70552484dc4489ef2b1b3106ede2b540da2cf806918446aec776d286487c8238fae4491ba9de2454e14f16075f45e6fccbeeea50b17412cd375af067c
 EBUILD inkscape-0.48.5.ebuild 2883 SHA256 c9a20a6cda80c95ea71d535ba3d921fc8e66899a12f7416f2619671a07a9f9d2 SHA512 f0a16c33c717d205226a9c6e7c703be0b3335cc7a22ed3daeae55c087456940146763111ee850221d12e7cda0dc625107bf92855d39ce11d17411b6d56b388d6 WHIRLPOOL e21e149bfcd57ee8e163ec5abd564267a8da16487767fdfb5927227067c29663e223330470be712dad68cac1d7477f3a4b3da8a81aabe4cdad38599dc50f1024
 EBUILD inkscape-0.91_pre3-r1.ebuild 3718 SHA256 11ab6d8c328817f3d5062364f4a1703b4a8d4c17a833b2109c6b4c87a8a54e48 SHA512 ff768de2f02ebf9a77fb73364348d746fe5fcb755f84ed150f6301e283e45c598756b75de2e570415ff082019721fdb80000a03d4fc28abba3cdfc3720a15c46 WHIRLPOOL 26ec220a90d659a7b5e125ac2b910dcd092920e7449b781d905149ed332d66742e4945ea716e361390603e2e71409ce352314bd9fc85b7b670226ccb39e9477a
 EBUILD inkscape-0.91_pre3-r2.ebuild 3755 SHA256 f7d342fa3352b4724a817b752a48b23411a8b27b542dbbb7780a95ba796e0739 SHA512 3ea345180cbef58c9146e7ee3fefad188ab8fd500b8bd71e54a3435542310682f54fec1c277ed8440da07382ca0859e1fa0d002a181a567718576ea93ddc66f4 WHIRLPOOL 4b14aec7ecba5f1076b68885cf529cd12a758faa606b7395f6bfa682fe58e715f79500d31d742152e43f6aa810060ba2d40f299385e4df49299a0b1508493ceb
-MISC ChangeLog 31517 SHA256 17e494ece2a5394291b0b023b82b99a284e05adebd4a3c1bab3e28e2bf1e722d SHA512 84fae5913673bd0500394e3ed4977a9b9710aed7fcbd12cc19760462c2cc717e71bc7480bbda47f22ec41bf72705eaf2304d1ffd0aad2c1a288a8e558b8577ca WHIRLPOOL 24e6b7befd1b362c3910d4df48e0ba41c84ea83b5b450ee50bdccf9edbc341e564f523a1281adfadb175046f971df9a0a1952d774e1722dabc996f1d1f4ed639
-MISC metadata.xml 541 SHA256 e05476ddcf29ff191f4f3e1b3de798976f8449baa54146610659fccd6203e6e7 SHA512 9004b3ad1510e745b6e42d3882df67df27f78b390aeec549b8e70f37ffbd95ab48d2fd33e27907f85270e66d4bab95f782b43ff3755c1281de9618ded8ff5eee WHIRLPOOL 568daff24271038f5ea5ffc58930dc55d876dfc0815c508d1f644147247ac608ed13ea6e722c439386d94ecdb639b5999dabf6d316f5c4403897e77df035f53a
+MISC ChangeLog 31755 SHA256 7272cc2f7bea625290b35bed5312bb854c2ac1f49f4d1f2f279a252662e263a0 SHA512 2dfc34abb4d74c1a8cf8930dd6239262cbcdb2068ee152e5daf4617da4d5e9c1dbfc78243bd288472cf6af08cd6b5c426ef81a6b86012e02af8454454fbc015c WHIRLPOOL 10c918c82c8e70fe4605bf14695a36f21f93bad3e8a98700babc018bf374f4fe91cc7e3e7e79257bc53f2330350d0cc15fc662998ff9fd8de58775f810d58ad1
+MISC metadata.xml 554 SHA256 55c0f5ffff3f4818f23478e0c1a26f38ca41aa0678e8e9299615bd10fccf65dc SHA512 5925b9cbb447fc6aa1b70850db579f9543984e6d965226a79ca5c51a147ccb52ba713b67f0d0ea985de73b1301d5fdb8ce6526721caae808e951bec8d176524d WHIRLPOOL a511a0140e256e3e1a2a0d1910ea789fcf715be264fa18fbbb53cb25a99d315f383ec24ced5770d5a9f0e92374c6706d23416d67e8e75f870dedbc58c8634f6e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUq7F4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6AEP/RJwXRNZeU6PQn7h7lzbcca3
+7CwRg5Aoj43Vtc4UvNaY2Mref2sY/nVQJkTn3f4mNmXEejmg/mpBtGwuF9k1264S
+xLEdy+3dEgPQtGKMAsHI56kqiJjC0AOAHWhlx7ugAZR4huCahJgv5GgcHr9IJqzI
+2ftyqLR3UoJP8mWBd6BBZ1tA34xaOnHypKl+dltFlmIbT1yWYB1jSNT9K3d9FoDS
+L7Z4ku/V81RL4X0XBMd3fBb9RpErL/wxUBQ5aorqI4hXdo+wDvJ+YFgL6hDnE0nR
+bhLUgIQM40gs2blkXN9OetoZeuzgjEfJchJ/fKvxM5n4j9v/12uKci7IVUccQqcr
+B0xpA7mrpTLjmI4BTigdUPtHedYbm+fE2ssmEobWlC52pgQ4Djs3SSyXFW6SCBKF
+bTENriStWNyOKAgPKWfYUUdQL99asHvKnh2R5fgboN9EslmXF16Z33P4JHtbZsCB
+4eXvq4Xbj0xI2anQTvL7vYJR/N4jGnKbwymzisnc3C+IMFw4OHU7SAePjuAdF7pg
+ebeNaHexKmOeMI78IltgBhaOQJHluDqblFBlsaiNDGUaOBu9MkyYVk/QJy+xvg26
+Iq3Z0zarmx0DEaukypvqD2nqYBF8zklJy5BlDi5uHR+L63Qndgyy3uu+VQtwypOR
+N1amu1PuAtqY29r2d/bs
+=oiK9
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
new file mode 100644
index 000000000000..bcfea9b77adb
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
@@ -0,0 +1,98 @@
+ configure.ac                                   |  5 ++++
+ src/extension/internal/pdfinput/pdf-parser.cpp | 32 +++++++++++++++++++++-----
+ 2 files changed, 31 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8e1ae2..d62c989 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then
+ 	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
+ fi
+ 
++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
++	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
++fi
++
+ # Poppler's b604a008 commit changes this
+ AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+ popplergfxcolor="no"
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index b6edbfb..3fbf237 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object args[], int numArgs) {
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+@@ -1085,7 +1087,13 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) {
+ 
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -1126,7 +1134,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) {
+ 
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -2756,7 +2770,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
+       }
+     }
+     if (!obj1.isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++            colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+             colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
+@@ -2847,7 +2863,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
+ 	  obj2.free();
+ 	}
+       }
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++            GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+             GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) {
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
diff --git a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
new file mode 100644
index 000000000000..0fc6a68eb807
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild,v 1.1 2015/01/06 09:57:11 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+GCONF_DEBUG=no
+
+inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	>=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[${PYTHON_USEDEP}]
+	media-gfx/imagemagick[cxx]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.4.0
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)"
+
+# 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[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-util/intltool-0.29
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch \
+		"${FILESDIR}"/${PN}-0.48.0-spell.patch \
+		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
+		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
+		"${FILESDIR}"/${PN}-0.48.4-epython.patch \
+		"${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
+		"${FILESDIR}"/${PN}-0.48.4-gc74-configure.patch \
+		"${FILESDIR}"/${PN}-0.48.4-poppler-0.29.0.patch
+
+	sed -i \
+		-e "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--without-perl
+		--enable-poppler-cairo
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_enable lcms)
+		$(use_enable nls)
+		$(use_with spell aspell)
+		$(use_with spell gtkspell)"
+
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index a282574c953c..100672a8684b 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<use>
-		<flag name='cdr'>Enable support for CorelDRAW Diagrams</flag>
-		<flag name='dia'>pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
-		<flag name='inkjar'>Enable support for OpenOffice.org SVG jar files</flag>
-		<flag name='visio'>Enable support for Microsoft Visio Diagrams</flag>
-		<flag name='wpg'>Enable support for WordPerfect Graphics</flag>
-	</use>
+  <herd>graphics</herd>
+  <use>
+    <flag name="cdr">Enable support for CorelDRAW Diagrams</flag>
+    <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
+    <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
+    <flag name="visio">Enable support for Microsoft Visio Diagrams</flag>
+    <flag name="wpg">Enable support for WordPerfect Graphics</flag>
+  </use>
 </pkgmetadata>