gentoo resync : 25.08.2020

18 files changed, 377 insertions, 989 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 922bee3cdd76..d3e26b2a6c6b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,22 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-AUX gimp-2.7.4-no-deprecation.patch 1061 BLAKE2B c34baed7be101547994f23a818d81b855c5b0058d5acce7bb185801083a07874a1a2c6fcc41a79502077cb03c3532d9cfba88212592449b747957b0c08eff205 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9
-AUX gimp-2.8.10-clang.patch 7670 BLAKE2B 923573fe329c9b8268ec220b2a0441ae765085c088a1524c5e323cc9615cfec4b8a57b2195e441ea9f43dd609f51f2de60512833652e822b466188787ffe41ec SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc
-AUX gimp-2.8.14-blend-center.patch 999 BLAKE2B 5324cf539a3ef54356f943d3a4cff7ed6abd0aecc5fa7af54193c5cdea0b4c3ca2073696dd1253ad49a451f6a87a50476a48b8bb6c6820e1b90338f3dd7efb0b SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930
-AUX gimp-2.8.22-cve-2017-17784.patch 1124 BLAKE2B 8358642d77aca1509942023384254295be74567e68147ca81a854c527ace4ab383ab5ae3dfff9a6e956e10da48db18faa1c84c71c780dff03e4fd84ec2feb180 SHA512 8feab75b01c8d5d57bf869f64ca377f8cfb239079fba97f66bf34f341d9d15f9a8e403b1fe04d27bdbb39151f99a208aa5236c8dd0b6afeac45400a29efa0da7
-AUX gimp-2.8.22-cve-2017-17785.patch 4747 BLAKE2B 45ccd40aca7b5d2603280c27275cee66cc7167c5f1a01c3025c21d70e3ae5f15b962ac3850d57aefd37b66ff76d2a86a7403ab72ae3927ca7763dc1b48bcd8d5 SHA512 51794739489a5e8babbc13c426dc34172caeab07cc8a64b5a8f19a4b88b736e3c9801cc4dadf6848b1e49031d2f1c7a336403a470a26a9ad8cad0a485a8342bd
-AUX gimp-2.8.22-cve-2017-17786-1.patch 2003 BLAKE2B b235625ab65426052b4a4d46923cbb5b2c67f95d03be9830e82b87c0d590f94f0c3a38aa3a447f7278498c3456e878eeaade44719e23360ecaf6971ce5a77738 SHA512 d4887c49cf73c8f0238c338137ac94854524daea8535e206e34a9dfdb63dbc9ec91839d01085c484c995b26882215b652f4f7e23aa614f29272b5a18c8afc019
-AUX gimp-2.8.22-cve-2017-17786-2.patch 1253 BLAKE2B a862581d48a990e3c4b8d185f4cf57d867b4171d27bb224dcf515c219fc181c0329870f98d7d09b9978c0332c485734172aa8cf933496c8b0cfb74be91bf9f1a SHA512 24d02cff72ec684aafd2cc6006955f283e6d5e102c37be0b426cade34219022a8225b367643ce3cfd786425fe53005e7db6a595ba507c7eacf402eebe2b44fa0
-AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef5947682a6b3c8ea01d97e32dca63fdb5ddeeea85550c4116196d16e63381cffa4ba03873490936da2cb501ee8d50367c0cbd SHA512 438376075d0a46809fd5f12f3d364b914c989ca512739b69da0f609100525da8dbc525ce57c144b5388eec525fd2d7b5c8098e63ddb70c68c186dee9b2ce7b83
-AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
-AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
-AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
-DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
-DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
+DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
 EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b2b10f183d00eb56adba4cc40f56877481831b319c11fa8cbbe6fe17929c60341c918610c20fca2355607b876c22 SHA512 3f86c2237be7978066780679326395666d96bd22d4e389aac60f2a0989939e809ad51f2f12018b5a4fbd7d1bbe1469b034c74c86e4321ae6fb8f8caacca9a7b1
-EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
-EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
-EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
-EBUILD gimp-9999.ebuild 6314 BLAKE2B a0c08fcf0c8962d67b688a41d1beaf1469a83e55b4947062431a740379788a8d4f20216a7e176dcbe01a7f6d58a85de72ac0b870f3200da458f57b1b72870f55 SHA512 c1b8c2c627123aaf6164dd2c650d329c2824d52f40f29acb46ae0c052636d3ca7226fd812c307a1a54d76f254668ca51ae9c40304dfff9c62ffa740e40cc3d07
-MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
+EBUILD gimp-2.10.18-r1.ebuild 6167 BLAKE2B 72365a42b68b73f96204e3fd2dcfd61b55f141ce582315f6828ad0c703baec407f376b8d82338d493cf6620facbd1c9bfdb9f4494164c95988419936ecf6f951 SHA512 a557135d986e349bb37a37822b96be7f79c4d31998c978488e72cf5259222357df81961b9981f9274cb54680ea932e2883407025fdd5ef3c97437df44ca77f12
+EBUILD gimp-2.10.18-r2.ebuild 6317 BLAKE2B 4ed48f6450955abc83ebfc73605a825d1ab493c27ddc4b389d06c93a092961343c9496712f308aee68f81c48757ec3e44257609127a9218b9f02a4d893b7c347 SHA512 44f765e80996107ca3d4b294c4018e23e8ae5619eb2c7cebe6b1f6f0e7614fa296839d58f5b10a5e3f547b12bd1c2e303edd8893d47b5733fc44816ff3b8a0b2
+EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
+EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
+MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
deleted file mode 100644
index 66bd93d0d1aa..000000000000
--- a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.ac	2012-01-02 13:15:53.695067626 +0100
-+++ configure.ac	2012-01-02 13:21:49.161623684 +0100
-@@ -1943,33 +1943,6 @@
- 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_31" != "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_26" != "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
- ############################
diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch
deleted file mode 100644
index 065c66b36139..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.10-clang.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- app/Makefile.am
-+++ app/Makefile.am
-@@ -120,29 +120,29 @@
- 
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
--	-u $(SYMPREFIX)xcf_init
-+	-Wl,-u,$(SYMPREFIX)xcf_init
- 
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
- 
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
- 
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
- 
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- AM_LDFLAGS = \
- 	$(munix)					\
---- app/Makefile.in
-+++ app/Makefile.in
-@@ -702,33 +702,33 @@
- 
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
--	-u $(SYMPREFIX)xcf_init
-+	-Wl,-u,$(SYMPREFIX)xcf_init
- 
- 
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
- 
- 
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
- 
- 
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
- 
- 
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- AM_LDFLAGS = \
- 	$(munix)					\
---- app/tests/Makefile.am
-+++ app/tests/Makefile.am
-@@ -63,22 +63,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
--	-u $(SYMPREFIX)xcf_init				\
--	-u $(SYMPREFIX)base_init			\
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
--	-u $(SYMPREFIX)gui_init				\
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)actions_init			\
--	-u $(SYMPREFIX)gimp_error_dialog_new		\
--	-u $(SYMPREFIX)menus_save			\
--	-u $(SYMPREFIX)gimp_tools_save			\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)xcf_init				\
-+	-Wl,-u,$(SYMPREFIX)base_init			\
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
-+	-Wl,-u,$(SYMPREFIX)gui_init				\
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)actions_init			\
-+	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
-+	-Wl,-u,$(SYMPREFIX)menus_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- # Note that we have some duplicate entries here too to work around
- # circular dependencies and systems on the same architectural layer as
---- app/tests/Makefile.in
-+++ app/tests/Makefile.in
-@@ -1221,22 +1221,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
--	-u $(SYMPREFIX)xcf_init				\
--	-u $(SYMPREFIX)base_init			\
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
--	-u $(SYMPREFIX)gui_init				\
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)actions_init			\
--	-u $(SYMPREFIX)gimp_error_dialog_new		\
--	-u $(SYMPREFIX)menus_save			\
--	-u $(SYMPREFIX)gimp_tools_save			\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)xcf_init				\
-+	-Wl,-u,$(SYMPREFIX)base_init			\
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
-+	-Wl,-u,$(SYMPREFIX)gui_init				\
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)actions_init			\
-+	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
-+	-Wl,-u,$(SYMPREFIX)menus_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- 
- # Note that we have some duplicate entries here too to work around
---- devel-docs/app/Makefile.am
-+++ devel-docs/app/Makefile.am
-@@ -62,10 +62,10 @@
- 	-UGTK_DISABLE_SINGLE_INCLUDES
- 
- GTKDOC_LIBS = \
--	-u $(SYMPREFIX)xcf_init		   				     \
--	-u $(SYMPREFIX)internal_procs_init 				     \
--	-u $(SYMPREFIX)gimp_coords_mix	   				     \
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
-+	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
- 	$(top_builddir)/app/app.o					     \
-         $(top_builddir)/app/batch.o					     \
-         $(top_builddir)/app/errors.o					     \
---- devel-docs/app/Makefile.in
-+++ devel-docs/app/Makefile.in
-@@ -511,10 +511,10 @@
- 	-UGTK_DISABLE_SINGLE_INCLUDES
- 
- GTKDOC_LIBS = \
--	-u $(SYMPREFIX)xcf_init		   				     \
--	-u $(SYMPREFIX)internal_procs_init 				     \
--	-u $(SYMPREFIX)gimp_coords_mix	   				     \
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
-+	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
- 	$(top_builddir)/app/app.o					     \
-         $(top_builddir)/app/batch.o					     \
-         $(top_builddir)/app/errors.o					     \
diff --git a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch b/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
deleted file mode 100644
index eba04df59aa2..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 97e55692ebad5897be334c81c133b6626b9b6920 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Wed, 26 Aug 2015 23:23:16 +0200
-Subject: app: the blend tool was rendering all gradients off-by-0.5
-
-When calculating the color of a pixel, we want to calculate the color
-at its center, not at its top-left corner. Found by Raymond Jennings.
-
-EDIT (by Sebastian Pipping <sping@gentoo.org>):
-  Cut away patch chunk for app/operations/gimpoperationblend.c
-  since 2.8.14 doesn't seem to have that file.
-
-diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
-index af565d1..e4f92a1 100644
---- a/app/core/gimpdrawable-blend.c
-+++ b/app/core/gimpdrawable-blend.c
-@@ -628,6 +628,10 @@ gradient_render_pixel (gdouble   x,
-   RenderBlendData *rbd = render_data;
-   gdouble          factor;
- 
-+  /*  we want to calculate the color at the pixel's center  */
-+  x += 0.5;
-+  y += 0.5;
-+
-   /* Calculate blending factor */
- 
-   switch (rbd->gradient_type)
--- 
-cgit v0.10.2
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
deleted file mode 100644
index c7df330409f8..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c57f9dcf1934a9ab0cd67650f2dea18cb0902270 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:25:32 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
-Similar to commit 06d24a79af94837d615d0024916bb95a01bf3c59 but adapted
-to older gimp-2-8 code.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b028100..d3f01d9 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -443,7 +443,8 @@ load_image (const gchar  *filename,
-     {
-       gchar *temp = g_new (gchar, bn_size);
- 
--      if ((read (fd, temp, bn_size)) < bn_size)
-+      if ((read (fd, temp, bn_size)) < bn_size ||
-+          temp[bn_size - 1] != '\0')
-         {
-           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                        _("Error in GIMP brush file '%s'"),
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
deleted file mode 100644
index 1f77d36ec6ca..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 1882bac996a20ab5c15c42b0c5e8f49033a1af54 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Sun, 29 Oct 2017 15:19:41 +0100
-Subject: Bug 739133 - (CVE-2017-17785) Heap overflow while parsing FLI files.
-
-It is possible to trigger a heap overflow while parsing FLI files. The
-RLE decoder is vulnerable to out of boundary writes due to lack of
-boundary checks.
-
-The variable "framebuf" points to a memory area which was allocated
-with fli_header->width * fli_header->height bytes. The RLE decoder
-therefore must never write beyond that limit.
-
-If an illegal frame is detected, the parser won't stop, which means
-that the next valid sequence is properly parsed again. This should
-allow GIMP to parse FLI files as good as possible even if they are
-broken by an attacker or by accident.
-
-While at it, I changed the variable xc to be of type size_t, because
-the multiplication of width and height could overflow a 16 bit type.
-
-Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
-(cherry picked from commit edb251a7ef1602d20a5afcbf23f24afb163de63b)
----
- plug-ins/file-fli/fli.c | 50 ++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 35 insertions(+), 15 deletions(-)
-
-diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
-index 313efeb..ffb651e 100644
---- a/plug-ins/file-fli/fli.c
-+++ b/plug-ins/file-fli/fli.c
-@@ -25,6 +25,8 @@
- 
- #include "config.h"
- 
-+#include <glib/gstdio.h>
-+
- #include <string.h>
- #include <stdio.h>
- 
-@@ -461,23 +463,27 @@ void fli_read_brun(FILE *f, s_fli_header *fli_header, unsigned char *framebuf)
- 	unsigned short yc;
- 	unsigned char *pos;
- 	for (yc=0; yc < fli_header->height; yc++) {
--		unsigned short xc, pc, pcnt;
-+		unsigned short pc, pcnt;
-+		size_t n, xc;
- 		pc=fli_read_char(f);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * yc);
-+		n=(size_t)fli_header->width * (fli_header->height-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps;
- 			ps=fli_read_char(f);
- 			if (ps & 0x80) {
- 				unsigned short len;
--				for (len=-(signed char)ps; len>0; len--) {
-+				for (len=-(signed char)ps; len>0 && xc<n; len--) {
- 					pos[xc++]=fli_read_char(f);
- 				}
- 			} else {
- 				unsigned char val;
-+				size_t len;
-+				len=MIN(n-xc,ps);
- 				val=fli_read_char(f);
--				memset(&(pos[xc]), val, ps);
--				xc+=ps;
-+				memset(&(pos[xc]), val, len);
-+				xc+=len;
- 			}
- 		}
- 	}
-@@ -564,25 +570,34 @@ void fli_read_lc(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf,
- 	memcpy(framebuf, old_framebuf, fli_header->width * fli_header->height);
- 	firstline = fli_read_short(f);
- 	numline = fli_read_short(f);
-+	if (numline > fli_header->height || fli_header->height-numline < firstline)
-+		return;
-+
- 	for (yc=0; yc < numline; yc++) {
--		unsigned short xc, pc, pcnt;
-+		unsigned short pc, pcnt;
-+		size_t n, xc;
- 		pc=fli_read_char(f);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * (firstline+yc));
-+		n=(size_t)fli_header->width * (fli_header->height-firstline-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps,skip;
- 			skip=fli_read_char(f);
- 			ps=fli_read_char(f);
--			xc+=skip;
-+			xc+=MIN(n-xc,skip);
- 			if (ps & 0x80) {
- 				unsigned char val;
-+				size_t len;
- 				ps=-(signed char)ps;
- 				val=fli_read_char(f);
--				memset(&(pos[xc]), val, ps);
--				xc+=ps;
-+				len=MIN(n-xc,ps);
-+				memset(&(pos[xc]), val, len);
-+				xc+=len;
- 			} else {
--				fread(&(pos[xc]), ps, 1, f);
--				xc+=ps;
-+				size_t len;
-+				len=MIN(n-xc,ps);
-+				fread(&(pos[xc]), len, 1, f);
-+				xc+=len;
- 			}
- 		}
- 	}
-@@ -689,7 +704,8 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- 	yc=0;
- 	numline = fli_read_short(f);
- 	for (lc=0; lc < numline; lc++) {
--		unsigned short xc, pc, pcnt, lpf, lpn;
-+		unsigned short pc, pcnt, lpf, lpn;
-+		size_t n, xc;
- 		pc=fli_read_short(f);
- 		lpf=0; lpn=0;
- 		while (pc & 0x8000) {
-@@ -700,26 +716,30 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- 			}
- 			pc=fli_read_short(f);
- 		}
-+		yc=MIN(yc, fli_header->height);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * yc);
-+		n=(size_t)fli_header->width * (fli_header->height-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps,skip;
- 			skip=fli_read_char(f);
- 			ps=fli_read_char(f);
--			xc+=skip;
-+			xc+=MIN(n-xc,skip);
- 			if (ps & 0x80) {
- 				unsigned char v1,v2;
- 				ps=-(signed char)ps;
- 				v1=fli_read_char(f);
- 				v2=fli_read_char(f);
--				while (ps>0) {
-+				while (ps>0 && xc+1<n) {
- 					pos[xc++]=v1;
- 					pos[xc++]=v2;
- 					ps--;
- 				}
- 			} else {
--				fread(&(pos[xc]), ps, 2, f);
--				xc+=ps << 1;
-+				size_t len;
-+				len=MIN((n-xc)/2,ps);
-+				fread(&(pos[xc]), len, 2, f);
-+				xc+=len << 1;
- 			}
- 		}
- 		if (lpf) pos[xc]=lpn;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
deleted file mode 100644
index 4047f7cb3c9f..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ef9c821fff8b637a2178eab1c78cae6764c50e12 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:02:38 +0100
-Subject: Bug 739134 - (CVE-2017-17786) Out of bounds read / heap overflow
- in...
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... TGA importer.
-
-Be more thorough on valid TGA RGB and RGBA images.
-In particular current TGA plug-in can import RGBA as 32 bits (8 bits per
-channel) and 16 bits (5 bits per color channel and 1 bit for alpha), and
-RGB as 15 and 24 bits.
-Maybe there exist more variants, but if they do exist, we simply don't
-support them yet.
-
-Thanks to Hanno Böck for the report and a first patch attempt.
-
-(cherry picked from commit 674b62ad45b6579ec6d7923dc3cb1ef4e8b5498b)
----
- plug-ins/common/file-tga.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index aef9870..426acc2 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -564,12 +564,16 @@ load_image (const gchar  *filename,
-           }
-         break;
-       case TGA_TYPE_COLOR:
--        if (info.bpp != 15 && info.bpp != 16 &&
--            info.bpp != 24 && info.bpp != 32)
-+        if ((info.bpp != 15 && info.bpp != 16 &&
-+             info.bpp != 24 && info.bpp != 32)      ||
-+            ((info.bpp == 15 || info.bpp == 24) &&
-+             info.alphaBits != 0)                   ||
-+            (info.bpp == 16 && info.alphaBits != 1) ||
-+            (info.bpp == 32 && info.alphaBits != 8))
-           {
--            g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
-+            g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
-                        gimp_filename_to_utf8 (filename),
--                       info.imageType, info.bpp);
-+                       info.imageType, info.bpp, info.alphaBits);
-             return -1;
-           }
-         break;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
deleted file mode 100644
index 7177dd3c1f11..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 22e2571c25425f225abdb11a566cc281fca6f366 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:26:26 +0100
-Subject: plug-ins: TGA 16-bit RGB (without alpha bit) is also valid.
-
-According to some spec on the web, 16-bit RGB is also valid. In this
-case, the last bit is simply ignored (at least that's how it is
-implemented right now).
-
-(cherry picked from commit 8ea316667c8a3296bce2832b3986b58d0fdfc077)
----
- plug-ins/common/file-tga.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index 426acc2..eb14a1d 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -568,7 +568,8 @@ load_image (const gchar  *filename,
-              info.bpp != 24 && info.bpp != 32)      ||
-             ((info.bpp == 15 || info.bpp == 24) &&
-              info.alphaBits != 0)                   ||
--            (info.bpp == 16 && info.alphaBits != 1) ||
-+            (info.bpp == 16 && info.alphaBits != 1 &&
-+             info.alphaBits != 0)                   ||
-             (info.bpp == 32 && info.alphaBits != 8))
-           {
-             g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
deleted file mode 100644
index 654726388ea6..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87ba505fff85989af795f4ab6a047713f4d9381d Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:49:41 +0100
-Subject: Bug 790853 - (CVE-2017-17787) heap overread in psp importer.
-
-As any external data, we have to check that strings being read at fixed
-length are properly nul-terminated.
-
-(cherry picked from commit eb2980683e6472aff35a3117587c4f814515c74d)
----
- plug-ins/common/file-psp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index 4cbafe3..e350e4d 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -890,6 +890,12 @@ read_creator_block (FILE     *f,
-               g_free (string);
-               return -1;
-             }
-+          if (string[length - 1] != '\0')
-+            {
-+              g_message ("Creator keyword data not nul-terminated");
-+              g_free (string);
-+              return -1;
-+            }
-           switch (keyword)
-             {
-             case PSP_CRTR_FLD_TITLE:
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
deleted file mode 100644
index 2bf16b85e607..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Hanno Boeck <hanno@hboeck.de>
-Date: Mon, 27 Nov 2017 00:37:29 +0100
-Subject: 790783 - buffer overread in XCF parser if version field...
-Origin: https://git.gnome.org/browse/GIMP/commit/?id=702c4227e8b6169f781e4bb5ae4b5733f51ab126
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17788
-Bug-Debian: https://bugs.debian.org/885347
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790783
-
-...has no null terminator
-
-Check for the presence of '\0' before using atoi() on the version
-string. Patch slightly modified (mitch).
-[carnil: backport to gimp-2-8: affected code in xcf_load_invoker]
----
- app/xcf/xcf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/app/xcf/xcf.c
-+++ b/app/xcf/xcf.c
-@@ -318,7 +318,8 @@ xcf_load_invoker (GimpProcedure      *pr
-         {
-           info.file_version = 0;
-         }
--      else if (id[9] == 'v')
-+      else if (id[9]  == 'v' &&
-+               id[13] == '\0')
-         {
-           info.file_version = atoi (id + 10);
-         }
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
deleted file mode 100644
index 3d63694f6790..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01898f10f87a094665a7fdcf7153990f4e511d3f Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 16:44:20 +0100
-Subject: Bug 790849 - (CVE-2017-17789) CVE-2017-17789 Heap buffer overflow...
-
-... in PSP importer.
-Check if declared block length is valid (i.e. within the actual file)
-before going further.
-Consider the file as broken otherwise and fail loading it.
-
-(cherry picked from commit 28e95fbeb5720e6005a088fa811f5bf3c1af48b8)
----
- plug-ins/common/file-psp.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index ac0fff7..4cbafe3 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -1771,6 +1771,15 @@ load_image (const gchar  *filename,
-     {
-       block_start = ftell (f);
- 
-+      if (block_start + block_total_len > st.st_size)
-+        {
-+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                       _("Could not open '%s' for reading: %s"),
-+                       gimp_filename_to_utf8 (filename),
-+                       _("invalid block size"));
-+          goto error;
-+        }
-+
-       if (id == PSP_IMAGE_BLOCK)
-         {
-           if (block_number != 0)
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
deleted file mode 100644
index e46703d3d3d4..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06d24a79af94837d615d0024916bb95a01bf3c59 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:15:34 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b8933e7..585e74a 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -456,7 +456,8 @@ load_image (GFile   *file,
- 
-       if (! g_input_stream_read_all (input, temp, size,
-                                      &bytes_read, NULL, error) ||
--          bytes_read != size)
-+          bytes_read != size                                   ||
-+          temp[size - 1] != '\0')
-         {
-           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                        _("Error in GIMP brush file '%s'"),
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
index 0b0909f7b22d..0bca675be274 100644
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
index 1213fde7aff4..f586c716b705 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
@@ -3,173 +3,195 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
 
-inherit versionator virtualx autotools eutils gnome2 ltprune multilib python-single-r1
+inherit autotools gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~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 cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
 	>=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 )
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=media-libs/babl-0.1.74
+	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gegl-0.4.22:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0[gegl]
-	>=media-libs/fontconfig-2.2.0
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
 	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.38
-	>=media-libs/gegl-0.3.24:0.3[cairo]
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
 	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.6.25:0
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
 	python?	(
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
-	sys-apps/findutils
-	virtual/pkgconfig
+	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
 	>=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)
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
 
 pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cve-2017-17784.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch  # bug 641954
-	# NOTE:                           CVE-2017-17788 already fixed upstream
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch  # bug 641954
-)
-
 src_prepare() {
+	if has_version "media-gfx/mypaint-brushes:2.0" ; then
+		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+	fi
+
 	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
 	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
 		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
 
-	gnome2_src_prepare
-
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+	gnome2_src_prepare  # calls eautoreconf
 
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
 	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
 }
 
+_adjust_sandbox() {
+	# 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/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
 src_configure() {
+	_adjust_sandbox
+
 	local myconf=(
-		GEGL=${EPREFIX}/usr/bin/gegl-0.3
-		GDBUS_CODEGEN=${EPREFIX}/bin/false
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
 		--enable-default-binary
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
+
+		--disable-check-update
+		--enable-mp
 		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
 		--without-webkit
-		--without-libjasper
-		$(use_with postscript gs)
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
 		$(use_with mng libmng)
 		$(use_with openexr)
-		$(use_with webp)
-		$(use_with pdf poppler)
-		$(use_enable python)
-		$(use_enable smp mp)
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with postscript gs)
 		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
 		$(use_with wmf)
-		--with-xmc
 		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
 	)
 
 	gnome2_src_configure "${myconf[@]}"
 }
 
 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=${EPREFIX}/usr/share  # bug 587004
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
 	gnome2_src_compile
 }
 
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
 }
 
 src_test() {
@@ -179,21 +201,24 @@ src_test() {
 src_install() {
 	gnome2_src_install
 
-	if use python; then
-		python_optimize
-	fi
+	use python && python_optimize
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -type f -delete || die
 
 	# 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
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
 
-	_clean_up_locales
+	_rename_plugins || die
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.10.20-r1.ebuild b/media-gfx/gimp/gimp-2.10.20-r1.ebuild
new file mode 100644
index 000000000000..347ade7269ef
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.20-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 python-single-r1 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=media-libs/babl-0.1.78
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.24:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python?	(
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if has_version "media-gfx/mypaint-brushes:2.0" ; then
+		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+	fi
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# 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/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	use python && python_optimize
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# 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
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
deleted file mode 100644
index 497e8fb7e44b..000000000000
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ltprune 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 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-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 lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-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 )
-	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}
-		$(python_gen_cond_dep '
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_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? ( dev-libs/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 \
-		$(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) \
-		--without-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}-cve-2017-17784.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17785.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17787.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17788.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17789.patch  # bug 641954
-
-	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
-
-	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() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			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-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 1ba63b659607..4bab1cc4f0bf 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -36,11 +36,11 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.78[introspection,lcms,vala]
+	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=media-libs/babl-0.1.80[introspection,lcms,vala]
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala]
+	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala]
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
@@ -118,6 +118,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if has_version "media-gfx/mypaint-brushes:2.0" ; then
+		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+	fi
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7d0fd04395e6..88724f7e8aab 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,14 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="smp">
-			Enable support for multiprocessors
-		</flag>
-		<flag name="vector-icons">
-			Enable support for vector icons (experimental)
-		</flag>
-		<flag name="heif">
-			Enable support for ISO/IEC 23008-12:2017 HEIF files
-		</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+		<flag name="vector-icons">Enable support for vector icons (experimental)</flag>
 	</use>
 </pkgmetadata>