gentoo resync : 29.10.2017

14 files changed, 2 insertions, 1337 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e44064b532e6..e1abaa3f2d67 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,25 +1,10 @@
 AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984
 AUX gimp-2.8.10-clang.patch 7670 SHA256 a7f057002f7749cdcb07871c3ef69aa73ab28e688ed5782316d5cb1489a0af1e SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc WHIRLPOOL 0baa2a9e7e3370d2b44a180f89c66306aa3f0a6fb4a675ae9fe3413032ce8b6a8a0bd03b33e86453a2a41340e504f641eead1c9b1e4461bb7133ecae713c52fc
 AUX gimp-2.8.14-blend-center.patch 999 SHA256 2fb7bdc7e31a833ddaa75c4ff7bd8ce0595b5a638f3cf9d387e2fd6a0f3764c4 SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930 WHIRLPOOL a1f3abe22a966a5490979c580e5c8bd591d0c3a12ae85fb86f306d066f18cc18249eeea2ac5459d99466161b09ba8167a52bb232f69839f383d809ec09e0705f
-AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b
-AUX gimp-2.9.2-CVE-2016-4994.patch 3118 SHA256 14f8b33b40b8de61a21276b26e6e908ef42cb19e7ea938b9a213661760af72dc SHA512 5268326b037ac174ca89525c0332620addd28348f2901e3725402c1aa9fbd2718245868fcb44405256a9c60b8b74df9c66850b0af5d80ca3c4ae7a76bbd523cb WHIRLPOOL 984d9198b18bfd7019b1b5e1348e1d7b18e2466f6d7b91ee7656feb64d2bbe9b46b376c29b8a589fea27b687ec58dd1c2255e1a99a346043ed92a3d9b5e4b0e4
-AUX gimp-2.9.2-gegl-0.3.8.patch 1810 SHA256 a10374d1992f3ead5b07d4f7b387bbb01309fc890e1c5cabeb77893bc32ef908 SHA512 215e51f12e0672dad81b87ae31cbc37a14176b357b6576057224b82d3f3b392485f1e12301ccb8cae97a9423a4ab177d9213538f0d1612e46250012ea3adeaa6 WHIRLPOOL 11bd3d0038c15b946fa1cb898d0e47b45dab06f0a1b390f627ec2b093cc4ff6ce6d2ec67c04d458525cc7528cc25f81916300f3609026bae33e56c67e2a19cd6
-AUX gimp-2.9.2-no-deprecation.patch 1391 SHA256 7e26743c6f51e942ddd051481d2ec30c59e691737f3b12bc548784243c4007e1 SHA512 69ec37957a22a8a7dfc40b912d6ba840bbaed6b27f41d1dc2447b36766c201c462a69a7b65014e21b4a4b7f87c0e630795cf64d13cf4bf7397e1a80290e71181 WHIRLPOOL 3242b67f6ca9129a0a55db340127c745de096d41d73b2666196ccaf81718b468c2393f14e57ab707856f91e5ce85787a48025f2a9f986b481ad7a158a50b78d2
-AUX gimp-2.9.2-version.patch 775 SHA256 07c83325eddd9af9be562a0878986c080ac7299954f726f5373db3ebb0bad821 SHA512 fe8894d9e89210b4d0a8584c1ad3825bb720964ad9194e0b088b6dea2e8b354a2d2f662748ea4f3c090ebb66b64c27a5922fa3d3cf3d49da9aa07e552ad608d6 WHIRLPOOL ce67beb429dd92ed1fcb6347d88eee0bf4bd7c0f36d987c35ef5edb4b7733478a253f4b00216e40f3a7964852e4094e1bcab6df73d68e8acb65fd1f5cb2964d1
-AUX gimp-2.9.4-CVE-2007-3126.patch 8937 SHA256 92dad0e1effa13636a02dd7b16d0065ca869432cff5b31366464a495a85bff4b SHA512 c3853f38204e8fcb6e492812f6c684601827517f988592526f41e285766c3ea688d404593bcaae75d8c2ba0bd2910c43f7b0ec5147659cfd2cc5429d38754306 WHIRLPOOL 8ed186ab843ecfbc82f73bf6b50938f3e0e4bb753bce8646b748d69de97d75dc6df5059338ce9978bf49f3cd52e974694beb979affcb29d5e389404be7583a73
-AUX gimp-2.9.4-gegl-bin.patch 705 SHA256 2425c117b68d812c7f1fcdac5e4654485fac0894302e5b1d7aaed281e5c0ce78 SHA512 3280cb607ba5539c17dc00816b9d745849db48ced676c0a6de3752a8ad3b7eb1717eb4b6af9a5a5db96aeaddd5992d23f0d06b2a3a967a6929e0092145594fef WHIRLPOOL 30044fb9dede9454b52d813bc445603e530e553159db90df8d84b5e26e6dc75cd0edda96d9a8080ab5cfec89662156a29d7bd498b4183bff023989122788e432
-AUX gimp-2.9.4-mkdir-makefile.patch 1492 SHA256 7bba311b9df6a17c73087bfc15db0ba7e7b215a7c4839f9fcc69aa2c826f2bc2 SHA512 c8fa19e79fcc2e38af002c472bdcf6656e3297826ba9df9e22335d09e062c84b32b5b39e9d43adc1ce8b9b20bc047e9a7ef3a52d9db39a69e03a2956204c6000 WHIRLPOOL f2ba749e8253dca3c37178aaf72a06b19d0de4582022a40613faee3058eaffcf2fde3c65f0ab89ef1bb2b530498983a6c9b7c98ea5d7585d90c6f49b2f95364f
 AUX gimp-2.9.6-underlinking.patch 653 SHA256 7a59c57012f68040d0a1df490b543566d1cc9e0530a148cc9dd505c2b66710a7 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3 WHIRLPOOL bbd0ecfc038fea235febb65f8859a327d37c73d40b0e1117292d7dcb05ca53769d726a8f3408f98202cea549affdc5f9a116b828eaa3346f52c904b571b9a91e
-DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
-DIST gimp-2.8.20.tar.bz2 20853324 SHA256 939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805 SHA512 5cd02854e21098c0d9d929e9131ede628ed520b6c76190eb9f6db38f057cff956e35b0a891d04c3a2e9c9e85c77f82d7ff5e63404187a8df921553763f649fd7 WHIRLPOOL 14b4791e6849629e3794de28d3bab228dc43df844c56c7777b31e36e4db3173e6c5ccda8f8f116b4fbd2dcec31c24de94d9b822f12bdb20ddc372cf035089355
 DIST gimp-2.8.22.tar.bz2 20873278 SHA256 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 WHIRLPOOL f9d2f2049b3bf91e8abb8a20b1fda93d801d66ca5d58a9710ae618b0289970c5eaf0df8f195de6c41a4f737fc9e666e011ff7061a45356f18cf426cbbedc3b06
-DIST gimp-2.9.4-r1.tar.xz 18510496 SHA256 c3f3cab83f70c1c2c11c6b94157def3a40f1fd335ffda2ef3e191865fc89d97a SHA512 60691506ad021d34a9728a76529fb7ff653f679979f23346ba84f1f9c36606c6bc118b611e92be79af894cba93746c8bdaeeb00012300c23fe995e50c3204025 WHIRLPOOL a042ac4ccbb8172526cc9fa2ff2df7ac35bd9fcd6283778e03f451766176422ddf250229d9a074821b7a991c24bb14058abe49d9739815681d250f6201467a75
 DIST gimp-2.9.6.tar.bz2 25472593 SHA256 b46f31d822a33ab416dcb15e33e10b5b98430814fa34f5ea4036230e845dfc9f SHA512 c874daedb00fbfa4156f0e244b217e221b047cb3bd22a81fb190a5d9d774212dc7802ec215151c6dc87136148bf9f84ca23a0a6340681a53c39b5fa71b2ded89 WHIRLPOOL c0166b2f7d3c0592c940030441f1d918463a5759ba8748c0c3ba0467b8dd15fea364041784e36aff4298e2754ae4f62d5cb83eb4e98531bf50bda1b7603b69c7
-EBUILD gimp-2.8.14-r2.ebuild 4872 SHA256 4dc87684397320cff14f83052aa9a617a90c13122ccf70c3dd49bea7fbda238a SHA512 168718d113cb300f08b77a5975ccd821d75139478664ea5d2d70213ce02486800fd0ff83e235361676d017e50d188e3b833e4a89bb0f0c95d48a73a3c1fa4eb7 WHIRLPOOL ad9b28244096cd4c978bc092d56e94845e8da418f4fd5a1696962f203c7b03d4fd7425d46dafa997ac46c4e893d901eebcff8f7d6045038c901adef15afb24d6
-EBUILD gimp-2.8.14-r4.ebuild 4896 SHA256 50233875990867140a44385421ca141f3252a1ab4c096f4e328ec7458e43b4ed SHA512 54a6c1a00c219df899740c2210415aab9d1e96a4439333027e7d07d0794a920e2737490b75d43375b4b2c48f812ceb07abc3c5f221f4d2bf3afd1772c0fe07bf WHIRLPOOL 30021375ad3362238393be92dfdacbc2444ab9b0019e137ada12d4a9187b79836583bedc2e130712cf30f8b9018bb1f6815a6b943c1018f6e201a0764fdabe2b
-EBUILD gimp-2.8.20-r1.ebuild 4836 SHA256 a1a54864560f650c82deec9083c44305fe7497d3badce21942e244788766fc2b SHA512 cf5fa5734366c0f716a3b4994bd0b7f16fb7f5fff5413b833659905936040016d2b966a95797a51550ffddb964bd2ad453e7f08619c1d376aae458a98869ddee WHIRLPOOL 60c0167a124cd1d7ee56dbadedff6562eefe681c8d2357227b548e189a133b8eb3f69793383178a9d8eb117d0edf0f5519dfdb20901c3358ee60a6dad69223b5
-EBUILD gimp-2.8.22.ebuild 4761 SHA256 309ea05cec920ee5c7715d6114ace627075b199f99165d62b225103846cb0f7b SHA512 3c0fb02fd4667a15f91ffc439913ec29cd66edd9eaace5079077bca69271c6901524a7ef35dd4337c4727145bf42a79c86aa65a8deaee3d5d571f593a7182a29 WHIRLPOOL d9ec98bd757339349dc337d285117ca135409c7b9caff49fde166ab6059b822f78cb1d1f7218ceda8f5afeef54ae65efb655229ff0563a7429eb8fa0725935f1
-EBUILD gimp-2.9.4-r3.ebuild 5147 SHA256 4fe9f2b17e0317cae0b70bfdd0522b9be9aee923a05f2c022ff56cf22636abff SHA512 b550dfd27f1649558ae59f7f9b2d05b95349e8c56ddd1494eec573ea92ad498f42779585f0346a1c4cca21ad970b80caf4167b23ba2676ee6aa208e555edce92 WHIRLPOOL 6dd63363a7b7299588f0d6ed5a1ffe7031cce0856ff611b4dcbb93ebbb2dc5a277e14fe00a7f5460dc096e6cb24137e674d2b9e0247a9efdb704a9dd5134bb70
+EBUILD gimp-2.8.22.ebuild 4760 SHA256 2a1876c2f6102092d1386ccf6dd70543d5d261838e3911c37ba386b024613fb0 SHA512 4911218b41c0b0f21af7fb8e0b31f2958d41dce51f8764bd92f8c4604a54b7e79528c819b5c464186af7c3f9890a5afc77d6ac85caaa47820d8010481c23a3e4 WHIRLPOOL bfab9bad431425d837effdfcbe33a8749e13dd810cbbeeaa8eadb7283276028e53cd3ce2c1119af5060920384e6fd9303b0e0c2f4a8f0400c8ceda3a17e3400c
 EBUILD gimp-2.9.6.ebuild 5334 SHA256 14d4b7242daaa08b7b66566bd425ebbf40028f057b8f8cf62b536cf2dad013a5 SHA512 bb8602bffe9a22b3ddd24ffcc6d08cb0dcf9f8f64052b77f0d948521c60a06ad87fbf0bdc4c0000d146e19d300fc2e76cf01e425b5a63ad15c9b20cb8c0ae960 WHIRLPOOL 47303bb7a1140d946dc5595d4101d7e614d0e87cd605038daab681416acb77d7de7ab961129cb7049a23cd344c60450a8bdcd5752bf5fd0d285fdb7ccd45ab40
 EBUILD gimp-9999.ebuild 5399 SHA256 d080f168060b128c3dfac9757af6232753e701209a61efe1f8d98b004098b7d9 SHA512 a1990254a48dc25e0f47591f500b6605bbbe8abc3d2558a7a72d078ac28698f71f95b0ba4eac28131ea2d3e064d4c64f8741693dc37d5bef517c101092e43616 WHIRLPOOL d337d6b84816e2a65def0852734c759c1875e9e74cf75e99a1fdea6149afa839ec9cc4e2f477ec67a99eb665998c43414b4dca6830eba2fd769cb6502f7286a5
 MISC ChangeLog 11158 SHA256 81ff7305864fda3dca3f0f17d5962d0a070135c39bd281dc8d4473bf407613c6 SHA512 10c4790c9bcc3c2d26f02a406591f379ac9af193e26c5d5c7933c3cbd1525fd9a6dc296680dc7c1a24b4385e4e14077b8fd9be55a5f9562f68b2e5165ea5b143 WHIRLPOOL 3f47da1911e4b4c9725f87808415aae1cddc62ccdb74314cd4af35c1c83eecf56cc4b9941623461f7731a44ff91be635eae1c816b347666919d298efd75bedae
diff --git a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
deleted file mode 100644
index 855e9872f4b4..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4fb7a436bca3e11abfda8bc23818af0f09714b9d Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Fri, 02 Aug 2013 14:50:00 +0000
-Subject: Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory
-
-Apply patch from Amadeusz Slawinski that checks for execinfo.h and
-builds the code that needs it conditionally.
----
-diff --git a/app/base/base-utils.c b/app/base/base-utils.c
-index 757f58d..44a9e89 100644
---- a/app/base/base-utils.c
-+++ b/app/base/base-utils.c
-@@ -29,7 +29,7 @@
- #include <process.h>
- #endif
- 
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
- /* For get_backtrace() */
- #include <stdlib.h>
- #include <string.h>
-@@ -112,7 +112,7 @@ get_physical_memory_size (void)
- char *
- get_backtrace (void)
- {
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
-   void     *functions[MAX_FUNC];
-   char    **function_names;
-   int       n_functions;
-diff --git a/configure.ac b/configure.ac
-index 0bbcbc7..15c7cc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,7 +416,7 @@ AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- 
--AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
-+AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
- 
- AC_TYPE_PID_T
- AC_FUNC_VPRINTF
---
-cgit v0.9.2
diff --git a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch b/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
deleted file mode 100644
index 846318b42149..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 6d804bf9ae77bc86a0a97f9b944a129844df9395 Mon Sep 17 00:00:00 2001
-From: Shmuel H <shmuelgimp@gmail.com>
-Date: Mon, 20 Jun 2016 17:14:41 +0300
-Subject: Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing...
-
-...XCF channel and layer properties
-
-The properties PROP_ACTIVE_LAYER, PROP_FLOATING_SELECTION,
-PROP_ACTIVE_CHANNEL saves the current object pointer the @info
-structure. Others like PROP_SELECTION (for channel) and
-PROP_GROUP_ITEM (for layer) will delete the current object and create
-a new object, leaving the pointers in @info invalid (dangling).
-
-Therefore, if a property from the first type will come before the
-second, the result will be an UaF in the last lines of xcf_load_image
-(when it actually using the pointers from @info).
-
-I wasn't able to exploit this bug because that
-g_object_instance->c_class gets cleared by the last g_object_unref and
-GIMP_IS_{LAYER,CHANNEL} detects that and return FALSE.
----
- app/xcf/xcf-load.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
-index f48558a..244d5c2 100644
---- a/app/xcf/xcf-load.c
-+++ b/app/xcf/xcf-load.c
-@@ -1141,6 +1141,18 @@ xcf_load_layer_props (XcfInfo    *info,
-         case PROP_GROUP_ITEM:
-           {
-             GimpLayer *group;
-+            gboolean   is_active_layer;
-+
-+            /* We're going to delete *layer, Don't leave its pointers
-+             * in @info.  After that, we'll restore them back with the
-+             * new pointer. See bug #767873.
-+             */
-+            is_active_layer = (*layer == info->active_layer);
-+            if (is_active_layer)
-+              info->active_layer = NULL;
-+
-+            if (*layer == info->floating_sel)
-+              info->floating_sel = NULL;
- 
-             group = gimp_group_layer_new (image);
- 
-@@ -1150,6 +1162,13 @@ xcf_load_layer_props (XcfInfo    *info,
-             g_object_ref_sink (*layer);
-             g_object_unref (*layer);
-             *layer = group;
-+
-+            if (is_active_layer)
-+              info->active_layer = *layer;
-+
-+            /* Don't restore info->floating_sel because group layers
-+             * can't be floating selections
-+             */
-           }
-           break;
- 
-@@ -1220,6 +1239,12 @@ xcf_load_channel_props (XcfInfo      *info,
-           {
-             GimpChannel *mask;
- 
-+            /* We're going to delete *channel, Don't leave its pointer
-+             * in @info. See bug #767873.
-+             */
-+            if (*channel == info->active_channel)
-+              info->active_channel = NULL;
-+
-             mask =
-               gimp_selection_new (image,
-                                   gimp_item_get_width  (GIMP_ITEM (*channel)),
-@@ -1234,6 +1259,10 @@ xcf_load_channel_props (XcfInfo      *info,
-             *channel = mask;
-             (*channel)->boundary_known = FALSE;
-             (*channel)->bounds_known   = FALSE;
-+
-+            /* Don't restore info->active_channel because the
-+             * selection can't be the active channel
-+             */
-           }
-           break;
- 
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
deleted file mode 100644
index a3aa236542bf..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/586828
-
-Backported from:
-https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b
-
---- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-+++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-@@ -66,23 +66,11 @@
-         }
-       else
-         {
--
-           copy = g_param_spec_string (pspec->name,
-                                       g_param_spec_get_nick (pspec),
-                                       g_param_spec_get_blurb (pspec),
-                                       spec->default_value,
-                                       flags);
--
--          if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
--            {
--              static GQuark multiline_quark = 0;
--
--              if (! multiline_quark)
--                multiline_quark = g_quark_from_static_string ("multiline");
--
--              g_param_spec_set_qdata (copy, multiline_quark,
--                                      GINT_TO_POINTER (TRUE));
--            }
-         }
-     }
-   else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
---- gimp-2.9.2/app/widgets/gimppropgui.c
-+++ gimp-2.9.2/app/widgets/gimppropgui.c
-@@ -227,11 +227,6 @@
-     }
-   else if (G_IS_PARAM_SPEC_STRING (pspec))
-     {
--      static GQuark multiline_quark = 0;
--
--      if (! multiline_quark)
--        multiline_quark = g_quark_from_static_string ("multiline");
--
-       if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
-         {
-           widget =
-@@ -239,7 +234,7 @@
-                                                g_param_spec_get_nick (pspec),
-                                                GTK_FILE_CHOOSER_ACTION_OPEN);
-         }
--      else if (g_param_spec_get_qdata (pspec, multiline_quark))
-+      else if (HAS_KEY (pspec, "multiline", "true"))
-         {
-           GtkTextBuffer *buffer;
-           GtkWidget     *view;
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
deleted file mode 100644
index 441298a08fde..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:14:37 +0100
-Subject: [PATCH] Do not disable deprecated APIs
-
----
- configure.ac | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4de6e53..8528e87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
- AC_SUBST(MIME_TYPES)
- 
- 
--#########################
--# Disable deprecated APIs
--#########################
--
--CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
--
--# Make sure not to disable deprecated APIs for unreleased versions.
--# We must build without problems with future releases of libraries
--# and disabling deprecated API risks breaking the build
--
--if test "x$have_glib_2_43" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gtk_2_26" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_pango_1_32" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
--fi
--
--
- ############################
- # Require multihead safe API
- ############################
--- 
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
deleted file mode 100644
index e48614455577..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:15:22 +0100
-Subject: [PATCH] Sync version string
-
-.. with
-m4_define([gimp_micro_version], [2])
-above
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8528e87..21d86a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
-           [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
- 
- # For overriding the version string. Comment out if not needed.
--# m4_define([gimp_version], [2.9.1])
-+# m4_define([gimp_version], [2.9.2])
- 
- # This is the X.Y used in -lgimp-X.Y
- m4_define([gimp_api_version], [2.0])
--- 
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch b/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
deleted file mode 100644
index 6c515173d9cd..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 46bcd82800e37b0f5aead76184430ef2fe802748 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sun, 6 Nov 2016 21:34:43 +0100
-Subject: Bug 773233 - CVE-2007-3126 - Gimp 2.3.14 allows context-dependent
- attackers...
-
-...to cause a denial of service (crash) via an ICO file with an
-InfoHeader containing a Height of zero
-
-Add some error handling to ico-load.c and bail out on zero width or height
-icons. Also some formatting cleanup.
----
- plug-ins/file-ico/ico-load.c | 103 ++++++++++++++++++++++++++-----------------
- 1 file changed, 62 insertions(+), 41 deletions(-)
-
-diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
-index c8091d3..8cce94f 100644
---- a/plug-ins/file-ico/ico-load.c
-+++ b/plug-ins/file-ico/ico-load.c
-@@ -124,15 +124,17 @@ static guint32
- ico_read_init (FILE *fp)
- {
-   IcoFileHeader header;
-+
-   /* read and check file header */
--  if (!ico_read_int16 (fp, &header.reserved, 1)
--      || !ico_read_int16 (fp, &header.resource_type, 1)
--      || !ico_read_int16 (fp, &header.icon_count, 1)
--      || header.reserved != 0
--      || header.resource_type != 1)
-+  if (! ico_read_int16 (fp, &header.reserved, 1)      ||
-+      ! ico_read_int16 (fp, &header.resource_type, 1) ||
-+      ! ico_read_int16 (fp, &header.icon_count, 1)    ||
-+      header.reserved != 0 ||
-+      header.resource_type != 1)
-     {
-       return 0;
-     }
-+
-   return header.icon_count;
- }
- 
-@@ -148,22 +150,25 @@ ico_read_size (FILE        *fp,
-   gint32      color_type;
-   guint32     magic;
- 
--  if ( fseek (fp, info->offset, SEEK_SET) < 0 )
-+  if (fseek (fp, info->offset, SEEK_SET) < 0)
-     return FALSE;
- 
-   ico_read_int32 (fp, &magic, 1);
-+
-   if (magic == ICO_PNG_MAGIC)
-     {
-       png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL,
-                                         NULL);
--      if (! png_ptr )
-+      if (! png_ptr)
-         return FALSE;
-+
-       info_ptr = png_create_info_struct (png_ptr);
--      if (! info_ptr )
-+      if (! info_ptr)
-         {
-           png_destroy_read_struct (&png_ptr, NULL, NULL);
-           return FALSE;
-         }
-+
-       if (setjmp (png_jmpbuf (png_ptr)))
-         {
-           png_destroy_read_struct (&png_ptr, NULL, NULL);
-@@ -182,8 +187,8 @@ ico_read_size (FILE        *fp,
-     }
-   else if (magic == 40)
-     {
--      if (ico_read_int32 (fp, &info->width, 1)
--          && ico_read_int32 (fp, &info->height, 1))
-+      if (ico_read_int32 (fp, &info->width, 1) &&
-+          ico_read_int32 (fp, &info->height, 1))
-         {
-           info->height /= 2;
-           D(("ico_read_size: ICO: %ix%i\n", info->width, info->height));
-@@ -200,8 +205,9 @@ ico_read_size (FILE        *fp,
- }
- 
- static IcoLoadInfo*
--ico_read_info (FILE *fp,
--               gint  icon_count)
-+ico_read_info (FILE    *fp,
-+               gint     icon_count,
-+               GError **error)
- {
-   gint            i;
-   IcoFileEntry   *entries;
-@@ -209,8 +215,11 @@ ico_read_info (FILE *fp,
- 
-   /* read icon entries */
-   entries = g_new (IcoFileEntry, icon_count);
--  if ( fread (entries, sizeof(IcoFileEntry), icon_count, fp) <= 0 )
-+  if (fread (entries, sizeof (IcoFileEntry), icon_count, fp) <= 0)
-     {
-+      g_set_error (error, G_FILE_ERROR, 0,
-+                   _("Could not read '%lu' bytes"),
-+                   sizeof (IcoFileEntry));
-       g_free (entries);
-       return NULL;
-     }
-@@ -218,23 +227,33 @@ ico_read_info (FILE *fp,
-   info = g_new (IcoLoadInfo, icon_count);
-   for (i = 0; i < icon_count; i++)
-     {
--      info[i].width = entries[i].width;
-+      info[i].width  = entries[i].width;
-       info[i].height = entries[i].height;
--      info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
--      info[i].size = GUINT32_FROM_LE (entries[i].size);
-+      info[i].bpp    = GUINT16_FROM_LE (entries[i].bpp);
-+      info[i].size   = GUINT32_FROM_LE (entries[i].size);
-       info[i].offset = GUINT32_FROM_LE (entries[i].offset);
- 
-       if (info[i].width == 0 || info[i].height == 0)
-         {
--          ico_read_size (fp, info+i);
-+          ico_read_size (fp, info + i);
-         }
- 
-       D(("ico_read_info: %ix%i (%i bits, size: %i, offset: %i)\n",
-          info[i].width, info[i].height, info[i].bpp,
-          info[i].size, info[i].offset));
-+
-+      if (info[i].width == 0 || info[i].height == 0)
-+        {
-+          g_set_error (error, G_FILE_ERROR, 0,
-+                       _("Icon #%d has zero width or height"), i);
-+          g_free (info);
-+          g_free (entries);
-+          return NULL;
-+        }
-     }
- 
-   g_free (entries);
-+
-   return info;
- }
- 
-@@ -256,10 +275,10 @@ ico_read_png (FILE    *fp,
-   gint          i;
- 
-   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
--  if (! png_ptr )
-+  if (! png_ptr)
-     return FALSE;
-   info = png_create_info_struct (png_ptr);
--  if (! info )
-+  if (! info)
-     {
-       png_destroy_read_struct (&png_ptr, NULL, NULL);
-       return FALSE;
-@@ -287,14 +306,14 @@ ico_read_png (FILE    *fp,
-     {
-     case PNG_COLOR_TYPE_GRAY:
-       png_set_expand_gray_1_2_4_to_8 (png_ptr);
--      if ( bit_depth == 16 )
-+      if (bit_depth == 16)
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
-       png_set_expand_gray_1_2_4_to_8 (png_ptr);
--      if ( bit_depth == 16 )
-+      if (bit_depth == 16)
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       break;
-@@ -427,16 +446,18 @@ ico_read_icon (FILE    *fp,
-      data.planes, data.image_size, data.bpp,
-      data.used_clrs, data.important_clrs));
- 
--  if (data.planes != 1
--      || data.compression != 0)
-+  if (data.planes      != 1 ||
-+      data.compression != 0)
-     {
-       D(("skipping image: invalid header\n"));
-       return FALSE;
-     }
- 
--  if (data.bpp != 1 && data.bpp != 4
--      && data.bpp != 8 && data.bpp != 24
--      && data.bpp != 32)
-+  if (data.bpp != 1  &&
-+      data.bpp != 4  &&
-+      data.bpp != 8  &&
-+      data.bpp != 24 &&
-+      data.bpp != 32)
-     {
-       D(("skipping image: invalid depth: %i\n", data.bpp));
-       return FALSE;
-@@ -590,8 +611,8 @@ ico_load_layer (FILE        *fp,
-   GeglBuffer *buffer;
-   gchar       name[ICO_MAXBUF];
- 
--  if ( fseek (fp, info->offset, SEEK_SET) < 0
--       || !ico_read_int32 (fp, &first_bytes, 1) )
-+  if (fseek (fp, info->offset, SEEK_SET) < 0 ||
-+      ! ico_read_int32 (fp, &first_bytes, 1))
-     return -1;
- 
-   if (first_bytes == ICO_PNG_MAGIC)
-@@ -643,7 +664,7 @@ ico_load_image (const gchar  *filename,
-                              gimp_filename_to_utf8 (filename));
- 
-   fp = g_fopen (filename, "rb");
--  if (! fp )
-+  if (! fp)
-     {
-       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                    _("Could not open '%s' for reading: %s"),
-@@ -658,8 +679,8 @@ ico_load_image (const gchar  *filename,
-       return -1;
-     }
- 
--  info = ico_read_info (fp, icon_count);
--  if (!info)
-+  info = ico_read_info (fp, icon_count, error);
-+  if (! info)
-     {
-       fclose (fp);
-       return -1;
-@@ -670,12 +691,12 @@ ico_load_image (const gchar  *filename,
-   max_height = 0;
-   for (i = 0; i < icon_count; i++)
-     {
--      if ( info[i].width > max_width )
-+      if (info[i].width > max_width)
-         max_width = info[i].width;
--      if ( info[i].height > max_height )
-+      if (info[i].height > max_height)
-         max_height = info[i].height;
-     }
--  if ( max_width <= 0 || max_height <= 0 )
-+  if (max_width <= 0 || max_height <= 0)
-     {
-       g_free (info);
-       fclose (fp);
-@@ -721,7 +742,7 @@ ico_load_thumbnail_image (const gchar  *filename,
-                              gimp_filename_to_utf8 (filename));
- 
-   fp = g_fopen (filename, "rb");
--  if (! fp )
-+  if (! fp)
-     {
-       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                    _("Could not open '%s' for reading: %s"),
-@@ -730,7 +751,7 @@ ico_load_thumbnail_image (const gchar  *filename,
-     }
- 
-   icon_count = ico_read_init (fp);
--  if (! icon_count )
-+  if (! icon_count)
-     {
-       fclose (fp);
-       return -1;
-@@ -739,8 +760,8 @@ ico_load_thumbnail_image (const gchar  *filename,
-   D(("*** %s: Microsoft icon file, containing %i icon(s)\n",
-      filename, icon_count));
- 
--  info = ico_read_info (fp, icon_count);
--  if (! info )
-+  info = ico_read_info (fp, icon_count, error);
-+  if (! info)
-     {
-       fclose (fp);
-       return -1;
-@@ -758,9 +779,9 @@ ico_load_thumbnail_image (const gchar  *filename,
- 
-           match = i;
-         }
--      else if ( w == info[i].width
--                && h == info[i].height
--                && info[i].bpp > bpp )
-+      else if (w == info[i].width  &&
-+               h == info[i].height &&
-+               info[i].bpp > bpp)
-         {
-           /* better quality */
-           bpp = info[i].bpp;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
deleted file mode 100644
index 31057b5796df..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d5de5ce62cd0410c9bccaa77725d0cad051faad Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 18 Jul 2016 17:42:45 +0200
-Subject: [PATCH] Fix gegl executable name to check for
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 45b31b1..0e5be99 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -674,9 +674,9 @@ else
- fi
- AC_MSG_RESULT($have_glib_2_43)
- 
--AC_PATH_PROG(GEGL, gegl, no)
-+AC_PATH_PROG(GEGL, gegl-0.3, no)
- if test "x$GEGL" = xno; then
--  add_deps_error([gegl], [Could not find gegl in your PATH.])
-+  add_deps_error([gegl], [Could not find gegl-0.3 in your PATH.])
- fi
- 
- 
--- 
-2.9.2
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
deleted file mode 100644
index 661ad699f5de..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 23 Jul 2016 01:02:10 +0200
-Subject: [PATCH] Fix creation of output directories
-
-https://bugs.gentoo.org/show_bug.cgi?id=589394
----
- icons/Symbolic-Inverted/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
-index 2981cfc..f3fe6a5 100644
---- a/icons/Symbolic-Inverted/Makefile.am
-+++ b/icons/Symbolic-Inverted/Makefile.am
-@@ -10,14 +10,14 @@ include $(top_srcdir)/icons/icon-list.mk
- # As exceptions, we do not want to invert some icons.
- # Just use these as-is: gimp-default-colors, gimp-toilet-paper.png.
- 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- 
- %/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/$(@D)/gimp-toilet-paper.png
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- 
- # Other exceptions: inverted gimp-color-picker-white|black are generated
- # from each other.
--- 
-2.9.2
-
diff --git a/media-gfx/gimp/gimp-2.8.14-r2.ebuild b/media-gfx/gimp/gimp-2.8.14-r2.ebuild
deleted file mode 100644
index d697e22cff94..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.14-r4.ebuild b/media-gfx/gimp/gimp-2.8.14-r4.ebuild
deleted file mode 100644
index 0f09309d6927..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.20-r1.ebuild b/media-gfx/gimp/gimp-2.8.20-r1.ebuild
deleted file mode 100644
index 36bb5254dd15..000000000000
--- a/media-gfx/gimp/gimp-2.8.20-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index 51de3fe64779..fc037aaa8de1 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-2.9.4-r3.ebuild b/media-gfx/gimp/gimp-2.9.4-r3.ebuild
deleted file mode 100644
index 8c75005f2e51..000000000000
--- a/media-gfx/gimp/gimp-2.9.4-r3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="https://www.hartwork.org/public/${P}-r1.tar.xz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.6.1
-	>=media-libs/libmypaint-1.3.0_beta0[gegl]
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.18
-	>=media-libs/gegl-0.3.8:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.2.37:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}-r1
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		--without-webkit \
-		$(use_with jpeg2k libjasper) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with openexr) \
-		$(use_with pdf poppler) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-librsvg \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		$(use_enable vector-icons) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	# Bug 589394
-	rm icons/Symbolic-Inverted/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-			GEGL=/usr/bin/gegl-0.3 \
-			GDBUS_CODEGEN=/bin/false
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-	addwrite /dev/dri/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}