Remove old.

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

9 files changed, 16 insertions, 507 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 182dcc7ff6b9..fe4aa0287dbb 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.216 2014/12/14 20:08:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.217 2014/12/14 20:11:41 radhermit Exp $
+
+  14 Dec 2014; Tim Harder <radhermit@gentoo.org> -inkscape-0.48.4.ebuild,
+  -inkscape-0.48.4-r1.ebuild, -files/inkscape-0.48.1-libpng15.patch,
+  -files/inkscape-0.48.4-fix-member-decl.patch,
+  -files/inkscape-0.48.4-gc74.patch, -files/inkscape-0.48.4-poppler26.patch,
+  -files/inkscape-0.48.4-python2.patch:
+  Remove old.
 
 *inkscape-0.91_pre3 (14 Dec 2014)
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 7226a0b772c5..3a547a7f0202 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -2,38 +2,29 @@
 Hash: SHA256
 
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
-AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
 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-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
 AUX inkscape-0.48.4-gc74-configure.patch 558 SHA256 1d378b0d90f2bde6469a040d61e3dbd8ecfcdf3b8c6c086b5dc8eb744918c20e SHA512 04254fcb2f910e73b30c85de5bed9009ec51dd8936eafa49909a90b8e7b44cdee79a73fca9d043a8659bbd551cc3db26f6dc9155849b6ff3df0d2f73bd4b163c WHIRLPOOL 5b74b3a9cea371f8ae862fba4c9848f13a4d450e1a253b789634b3bbe88df9d86e3e501da04805d3d755e613e8439d79c1ac7ff515a3693cafe615d62effe7c9
-AUX inkscape-0.48.4-gc74.patch 2131 SHA256 e9f308ea08b76af028184fd9e6a3228c7efa57b75697eb65bb0edbf7d6d12f4b SHA512 d4b3189b19c41dff5e835e3ca5454cec7f962cfd5c3bd4098f4346913029bb00d8d8f4b61e6fe056059b3f059c91c350b610cc4d85c830293b5d3ed31202a317 WHIRLPOOL 9ddf564290eb9e7f7b281233c6cac7f1b46fdf338d88a0af699dd48077f10289a482c21ede8f3ceac71cca080b20691dac449b53063805f3d7ababb6b87efdde
-AUX inkscape-0.48.4-poppler26.patch 4481 SHA256 fc07d1133ce703b4fc94706e2fe2377a7e58c216781d699360f8b58fa2787748 SHA512 4ed27cdaa2e0c48875942cf609ecb0de256c4fdb17aa30babc996b9113097032d789e4db957e2edcc6aa600b5148c08597dddd57a651a41949e4ae58d27aa22f WHIRLPOOL f973d7b80b106131cc48409bc27489c9ddaa12b52678bb1338acc0d0687e9ed1d2098ddefe3dd631770fd47a41a332d9288e373a9af3e6953472e1269845890d
-AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 AUX inkscape-0.91_pre3-automagic.patch 3295 SHA256 2d22669ca8bf93e4a739a617aa502216020c3fd90354d21515a91e4bede00bdc SHA512 a69f6d104391ffd3e37f69768d0dbc3bf1c26cb695f8e4e7eee3956647e5e30333275aed82da7b71b453c6d1f6636ad77e3df1fefb91aa799604e8d7f3c20e42 WHIRLPOOL 4e7a4400fd8f34ce7f07cb0172f64b16453d0a984deced07da2e397de816b0da2c5204f5c4468999f7adcb835b32ca77968ae0ab469fb66ba335718e76e8c7a6
 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
 AUX inkscape-0.91_pre3-sk-man.patch 362 SHA256 56e24d84d5217308df178d64214ec13c4b81ba59541cc6f52415f2207825a274 SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab WHIRLPOOL d92a002591b0c4c6dd898fd720827ef94d6f801fd025ad8bfd4eaddb262240fb9cbc84485087063485292a300a7411a21c1666de8a3f51178103720079f57eee
-DIST inkscape-0.48.4-freetype251.patch 355 SHA256 dfbd16faa4f27559561e3bad79b7ecbb3ea7d4824223cbfe2e2c1c2f429ce663 SHA512 4b629974954a6228586a4ddff2a1107b170348d6aa2a5886bf8422c44826ea4b6e1eea2e4fb886a6153029b371a33f56d4a62ecbbcb3c705456cca893d1986b7 WHIRLPOOL 2e419a35993dca56d6b6def94d5f58aea4b56fc100aedf52fe8e2c79a8d93ea8fbbe097197e51b962f015564b2316ce1798771ad038cf1ae48759ea2de0c4751
-DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
 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.4-r1.ebuild 3175 SHA256 680436bbf448686e992e58432059556d90a49c64bf6caf3f4f95c40c5458339b SHA512 36d466a59b90daee029e09c274a3bdbcb210549d0c117e9d7f8f411c2f37450b9a9b954bd8ff65cec98f5771d80d9a39f6d6afe536733a53f9b7dac26701fb31 WHIRLPOOL a5f0f551565d1dc18cc3a6e4a48ca5d9c5811639bcb2a3e72e348147d98419239570fcaabfd1e46ccd174a7a803c125a3a629f8f2c084b3617a848b0a6ff89f4
-EBUILD inkscape-0.48.4.ebuild 2626 SHA256 b7b296bdf6f7d2cb4db4e37eca4a197de03d29d06432b6629ed3145df316185c SHA512 d92b0273f29bc7323b280eedbb2fab7acc50b3a60a215b42c08ca77901dcda1452a0d21d66fc0ea8134487279d5063c2d8cf76dcb28da265ac4c82cc79fd46e4 WHIRLPOOL 30c48e6d9d253832964863117bb6f78922e19e5ae5b81988f4c0a7ec4d5dffabd217b9744cb4d933626341af630bdd6cd185405e9bf8b7242de589944a168e31
 EBUILD inkscape-0.48.5.ebuild 2883 SHA256 c9a20a6cda80c95ea71d535ba3d921fc8e66899a12f7416f2619671a07a9f9d2 SHA512 f0a16c33c717d205226a9c6e7c703be0b3335cc7a22ed3daeae55c087456940146763111ee850221d12e7cda0dc625107bf92855d39ce11d17411b6d56b388d6 WHIRLPOOL e21e149bfcd57ee8e163ec5abd564267a8da16487767fdfb5927227067c29663e223330470be712dad68cac1d7477f3a4b3da8a81aabe4cdad38599dc50f1024
 EBUILD inkscape-0.91_pre3.ebuild 3589 SHA256 98724a05715e9b6f4a3ec83d563f180937c03b74c45862bfedba19965e7fc008 SHA512 6570ddd6c708e499f7af40eb534c5e554a7c837a84bea26ad0af31339d55828880bb1a10766be61ed8b5615530474ce86ba2ca2b2c7834c00c34c4684f8be6f5 WHIRLPOOL e4a773175f2175baed95f015c64632b3cf30598db3dba275178c221aeb9566dc09a60b74ac5875a18196d884c88619289c45f7337da5582a4092e510cac0a31a
-MISC ChangeLog 30683 SHA256 47a4eb20c196fae46ffcb267a7d717e5c4e13e4f91ebf80aaef5ec799203e9cf SHA512 5d065756874b6732ae2199a849230926d809629ef30804e9d0f1c71b48371983f47bb1adf8e0b6165311551f970ebe57ed9266486d9efa311bc7365714fc5a2c WHIRLPOOL df01b5710d00cfb37ef7dc4d0764fb3f59f6ce52f7928884af44030f420eb3f8f7ff2a85db8d7b728faf1b06ab79750c052d2fea99e736d97ac5a0eadc8955e4
+MISC ChangeLog 31006 SHA256 21f6f3693b4859cea312112bd8e06ad38b3a3fbc91158d7c9422666d9aee36ea SHA512 f3bfe2ea1ce2cda282bc35a4767a680c138fa04252adbbd311f944520c1c23aa746c851b9e3fb91780a8721d40d2dbe15c41a53895647504cee8892cc3a88fd9 WHIRLPOOL 979a9663b33737488f61eb241149b3754d75ffc54245ac0dc60f8b335def57ddc8bb9e6690aa970987fa82343e0957e117d36d47326bcb3f9a15a9ff8c87f692
 MISC metadata.xml 541 SHA256 e05476ddcf29ff191f4f3e1b3de798976f8449baa54146610659fccd6203e6e7 SHA512 9004b3ad1510e745b6e42d3882df67df27f78b390aeec549b8e70f37ffbd95ab48d2fd33e27907f85270e66d4bab95f782b43ff3755c1281de9618ded8ff5eee WHIRLPOOL 568daff24271038f5ea5ffc58930dc55d876dfc0815c508d1f644147247ac608ed13ea6e722c439386d94ecdb639b5999dabf6d316f5c4403897e77df035f53a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUje5mAAoJEEqz6FtPBkyjGIEIALKWjWIjBfV7z6tbzoxPiUAh
-QgchJhq5GR51soT7yNEFnJZ4jlYM8FPyPXp1wmPVNhwyJYJqrmCRI2j65t6d1Jpi
-JMMatBz+cpuHmHhMZNjciPAiLBF8dySO8e1UvDezftg9s5pZplGCu3F8Kk/ZF1pV
-B5jmub6AVALb9P+QzRalyFvdSGmqgguxm4mTdnDIAY6FD8KrQ462KQXHs3lL4S8Z
-JWKllyTcfrgZcHNLVN8UFKeC+/Yy12bzfaQgKYwAMJm6eyDYkG8+X6PAyHsHbghn
-+vfiZc2i4L53qVcNaFGh6nvYHabbwouvjNewpqvV7q59nkNTHTQW72hRkkBGi74=
-=yGPt
+iQEcBAEBCAAGBQJUje8IAAoJEEqz6FtPBkyjOqoH/1U0yWQ+hrEo+v9esFyZwbnQ
+x5Wh4puRxYTa3VpzyFVaRAsYgleLGz+Uaa6j8dlGvZlX3IEdHzxDuyz/0VZV5nk0
+AOeN6eifIRXzX/2sdbZ3vDCbk1NaG7PJCH8xV+DDc83H+WfVBXBbChb+aatzRNmC
+1uXHIpH+/XaKNj6/MtH2dBl/qKrQ//94GDaW8THKNDQQEMIjuoVfPmTJWmxiG+uJ
+6nNzL1FguodYQJ05A6iqSTcfa7k2IF3azhFlv71Ws6mEvBeMgbN1j195nGoCWKu1
+zPhnDV/3SyRDqEX4o1qw2Vdnno3hZvpl5xLgLkYe2kM21rRCczHKtXusSs96r4w=
+=n2Hx
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch b/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch
deleted file mode 100644
index e24913ed627d..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch b/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch
deleted file mode 100644
index 993dfdaf9193..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.48.4/src/widgets/desktop-widget.h
-+++ inkscape-0.48.4/src/widgets/desktop-widget.h
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch
deleted file mode 100644
index 41615ac49a30..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-gc74.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- inkscape-0.48.4/src/gc-core.h.old	2013-12-31 01:22:38.976653890 +0400
-+++ inkscape-0.48.4/src/gc-core.h	2013-12-31 01:22:48.525653608 +0400
-@@ -57,7 +57,7 @@
-                                            CleanupFunc *old_func,
-                                            void **old_data);
-     int (*general_register_disappearing_link)(void **p_ptr,
--                                              void *base);
-+                                              const void *base);
-     int (*unregister_disappearing_link)(void **p_ptr);
-     std::size_t (*get_heap_size)();
-     std::size_t (*get_free_bytes)();
---- inkscape-0.48.4/src/gc.cpp.old	2013-12-31 01:23:50.462651778 +0400
-+++ inkscape-0.48.4/src/gc.cpp	2013-12-31 01:40:37.718622017 +0400
-@@ -70,8 +70,8 @@
-     return base + debug_base_fixup();
- }
- 
--int debug_general_register_disappearing_link(void **p_ptr, void *base) {
--    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
-+int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
-+    char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
-     return GC_general_register_disappearing_link(p_ptr, real_base);
- }
- 
-@@ -90,7 +90,7 @@
-     }
- }
- 
--int dummy_general_register_disappearing_link(void **, void *) { return false; }
-+int dummy_general_register_disappearing_link(void **, const void *) { return false; }
- 
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
- 
-@@ -112,7 +112,11 @@
-     &GC_malloc_atomic_uncollectable,
-     &GC_base,
-     &GC_register_finalizer_ignore_self,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
-     &GC_general_register_disappearing_link,
-+#else
-+    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
-     &GC_unregister_disappearing_link,
-     &GC_get_heap_size,
-     &GC_get_free_bytes,
-@@ -202,7 +206,7 @@
-     die_because_not_initialized();
- }
- 
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, const void *) {
-     die_because_not_initialized();
-     return 0;
- }
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch
deleted file mode 100644
index af5189777d7f..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ruN inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp
---- inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2012-12-13 18:00:46.726633000 +0100
-+++ inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp	2014-05-07 22:50:03.891488716 +0200
-@@ -56,6 +56,11 @@
- #define M_PI 3.14159265358979323846
- #endif
- 
-+#include "poppler-features.h"
-+#if POPPLER_CHECK_VERSION(0, 26, 0)
-+#define POPPLER_26
-+#endif
-+
- //------------------------------------------------------------------------
- // constants
- //------------------------------------------------------------------------
-@@ -861,8 +866,12 @@
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#ifndef POPPLER_26
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
- #else
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
-+#endif
-+#else
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
- #endif
- 	  }
-@@ -1085,9 +1094,17 @@
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
-+#ifndef POPPLER_26
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+#else
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-+#endif
-   } else {
-+#ifndef POPPLER_26
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-+#else
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
-+#endif
-   }
- #else
-   if (obj.isNull()) {
-@@ -1120,9 +1137,17 @@
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
-+#ifndef POPPLER_26
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+#else
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-+#endif
-   } else {
-+#ifndef POPPLER_26
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-+#else
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
-+#endif
-   }
- #else
-   if (obj.isNull()) {
-@@ -1213,7 +1238,11 @@
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
-+#ifndef POPPLER_26
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+#else
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-+#endif
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1273,7 +1302,11 @@
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
-+#ifndef POPPLER_26
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+#else
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-+#endif
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1711,7 +1744,11 @@
-   GBool savedState = gFalse;
- 
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#ifndef POPPLER_26
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-+#else
-+  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
-+#endif
-     return;
-   }
- #else
-@@ -2727,8 +2764,12 @@
-     }
-     if (!obj1.isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#ifndef POPPLER_26
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-+      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#endif
-+#else
-       colorSpace = GfxColorSpace::parse(&obj1);
- #endif
-     } else if (csMode == streamCSDeviceGray) {
-@@ -2816,8 +2857,12 @@
- 	}
-       }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#ifndef POPPLER_26
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#endif
-+#else
-       maskColorSpace = GfxColorSpace::parse(&obj1);
- #endif
-       obj1.free();
-@@ -3007,8 +3052,12 @@
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#ifndef POPPLER_26
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
- #else
-+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
-+#endif
-+#else
- 	blendingColorSpace = GfxColorSpace::parse(&obj3);
- #endif
-       }
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch b/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch
deleted file mode 100644
index a586053e9192..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.48.4/src/extension/implementation/script.cpp
-+++ inkscape-0.48.4/src/extension/implementation/script.cpp
-@@ -89,7 +89,7 @@
- #ifdef WIN32
-         {"python", "python-interpreter", "pythonw" },
- #else
--        {"python", "python-interpreter", "python" },
-+        {"python", "python-interpreter", "python2" },
- #endif
-         {"ruby",   "ruby-interpreter",   "ruby"   },
-         {"shell",  "shell-interpreter",  "sh"     },
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
deleted file mode 100644
index 08095cca8e54..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.14 2014/07/04 19:35:41 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_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
-	https://launchpadlibrarian.net/157792073/1255830-fix-freetype-includes-backport-0.48.x-v1.diff -> ${P}-freetype251.patch"
-
-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-fix-member-decl.patch \
-		"${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
-		"${FILESDIR}"/${P}-gc74-configure.patch \
-		"${FILESDIR}"/${P}-gc74.patch \
-		"${DISTDIR}"/${P}-freetype251.patch \
-		"${FILESDIR}"/${P}-poppler26.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/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
deleted file mode 100644
index af1059f6db7f..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.9 2014/05/24 00:07:15 dilfridge Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-
-GCONF_DEBUG=no
-
-inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-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 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome postscript 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[cxx]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
-	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
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog NEWS README*"
-
-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}"/${P}-python2.patch \
-		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
-		"${FILESDIR}"/${P}-poppler26.patch
-
-	eautoreconf
-
-	# bug 421111
-	python_convert_shebangs -r 2 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)"
-}