gentoo Easter resync : 12.04.2020

11 files changed, 3 insertions, 707 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index ef89b5fe635c..4b122c4c8532 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,24 +1,13 @@
-AUX FLTKConfig.cmake 1217 BLAKE2B 72f293da76dfdf88d273db05f04bc9c16a3eedbd86c02fff8f0e43ab1edead74814a9fc91a9ffce63216032efe038b1e1bb64bf886bedeefb7a5333644dc131b SHA512 11fab963f33db7a7c86a10f9f5ddbfa99e718603e9338c23bc078ebdcc4e82f8fc4869a664f9eba9648ee22e5874471f9e7b45c92c8a1b7b72b8ce8ca084941e
 AUX fltk-1.3.0-share.patch 1843 BLAKE2B aff10c9f4ebf2512b89d641505d25a948bfcc594755139a592b9bb60a578e0e04f001362d43576fbe8719134e475db27409a125114d246a1ed702b2ccb43ece1 SHA512 d6c60614bc92125675758c1dbc635bd336282cef56844fe5c9de61c006a35359e521e01cda3ae20788f37f964d35b802e7ab286f4d5e10ca7e65a02955067af4
-AUX fltk-1.3.2-conf-tests.patch 2259 BLAKE2B 80139ba789e9b8e4251e9b109055e6199e98332aec39c530218a7764b44d939e260b7320a58ae09ae0147f2ffca854c879514e1a70372fc53848aa8a6c69765b SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459
-AUX fltk-1.3.2-desktop.patch 420 BLAKE2B d00840d72c0d622c3bbfad719e7a1a2e96db6c4dfbc3534855bb98d34554c9be549b750db158c1972fa0c22d4d5cc0be93812ec4bd3e5c2a1ed871bac1575708 SHA512 be286fa414d9d7f411176f788e05f6ba43f6bccce2567430f42d2cd848b47aab6aaa9d0a7fb4453a30bc1a193c6c74e893a99311f6d73799259ea7faa042771c
-AUX fltk-1.3.2-jpeg-9a.patch 587 BLAKE2B a25a7993a40f20f83f22da01736001926132e56b21e040f58ca3557c27e90efd7c93b1c71151a5579ca77d6a38ad27f0ce5e5177dd7eea1f7faeb11e9a937bee SHA512 dd7e2c53cd9f114308be8098980de181d06a230f784ba494d13c9122fd46684dd234188c43d941d3f50c34a8f1f96f19f279bbab19954ed7c257d20a1d14eab1
-AUX fltk-1.3.3-fl_open_display.patch 210 BLAKE2B 75fd9035fd4e1fca29cf77ef80e3c66b5395bd867dd21212017fab19900f6c7dda02991dc762b8f58765a4f91541b9a2b0df27d7124d662e963e361e6690b6cb SHA512 902d69af29fa08dbb85ecadc709ea4c5999bee5d0acbb6338b62e2f561ae3baa90350fbd92c16791a58858635ffbdf9cc6512c54712abd1e2700f633122e082d
 AUX fltk-1.3.3-fltk-config.patch 374 BLAKE2B 586aed22e1661424b6221df46827c55204599095ca54a40582de7be04b495b02d23a87f047f5e4c9ecd25b3eaee2e79400ef8b5e41ffc5c2032be3e84f8fa8f7 SHA512 1e7bc815aed18708d7e7450079c9cb8d972b5d0f306bd665e0b89c4d108a7e8a21375e5ec1a5ef11114995d6a7997071040a76c4bfbb7b61a3e22f34be73b914
 AUX fltk-1.3.3-makefile-dirs.patch 230 BLAKE2B 517999f39b9de4f1f4f447e1d394ad562ead6354a94cf8a20e572182ab8f1e2e567406e07da365cc175ed427d9c94495f2287322cc6f6dc4ab24ffd43360472e SHA512 725cdbfa46b691a2adb55bb76fa44dc62cc1d8b83ad79c272bfee9dec9ec116cd1f974eba880e8f2a0d68365639cc4b65c40ca92304080f9cb73ce34a7f5df90
 AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d002f23c51b770f6342d02cc0ea6d6bf1574aa40c25ed6cb5b2bc97c141f0787c67fa283ca8ef5b0753473d977713 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df
-AUX fltk-1.3.3-xutf8-visibility.patch 4557 BLAKE2B 963c2dbc5d5466d3b5c35b411d53a59d4c8f08b186e9f14b67c5945ea3356ca697c804587b291fdee57c432d738106134dc12158230cc6236f4836fb39dc7e2d SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d
 AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
-AUX fltk-1.3.4-freetype_pkgconfig.patch 1008 BLAKE2B ea91b4cf2b1a4cb26d7cb58d58b39e1851428fb2eacb13a30027cd315a7bb9c23109bc9abed954267d3d94494389ea8aad078a0d502cd1080cffacabec3c458e SHA512 8c13464b28639ae641e23aea799e23bfb6a4253fd8341ad656231116939f312e85b1117037089acbfce88c43a50a368493f311353b14dc0938444d56f49464f4
 AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0457f376b7e856419d1b1f7132de2215fbfa32cb00c5216cc7dd8f52df31ddf8c035e7c723474a3ad3b328d9 SHA512 bf67629bbc7a00b6b10a59028b56b69bb253510d0dce63a530b622e8caf71a7e3d84fae2100ffcbf8207990f61031bc5c330a239dd928440825564a8cae102de
 AUX fltk-1.3.5-optim.patch 198 BLAKE2B 1fc6df1d2932d8c792802e437c60c6f02f9e50be5a997e60f2017796e0f5ec8c40886af1946c9269b0c5a2e8ca40be92dd499e373f02be6a62eb59d56c0d3993 SHA512 839cb0d543187bbaabb916eeb33a96e14808e65c7e6e1aaed61f33efa1f56857757f48d9b4852c711fb296c3e480175449dd0dc5167f589975220276d05e6a67
 AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
-DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
-DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3768 BLAKE2B ded7bb2b8d768e1cff8fd0f05ee590721e61023a65b90be4b76e55c3a0e913fac784b500bd861f907dd94fefae3a9e3c877c9fe62244c1a8293cad73c6705bb6 SHA512 c3dff0663a97b4ea9b164dcc26e14f895080aaf9598f3f912f72797f670dbccccb2b9fa597a5f378cd77823177840fc64596c834d022a992d2ea469e075d0149
-EBUILD fltk-1.3.4.ebuild 4324 BLAKE2B 70e62743d4bcdd58e4650a8b38f1556cc06cdc77c6d453925878c72f16defeb032702ac4f10e29b2a979fbdafca958c3fd6468d1b1b5b7c0eb562991891383d0 SHA512 c889953042a4fc8843a2e2ab4cfea7019e668e09703f80e5b506c64345e3a723614aad2ff9335124c7bf8f48fffff5b3558f6f71ae25fffbf263be12de9e9d9e
-EBUILD fltk-1.3.5-r4.ebuild 4445 BLAKE2B a19ab85242cbc81e64f6111253a6e3319f6601e07787f34b4c2c29c5b13c459580e3cc866148a955c6b1585e3119d81d3a09d149c935ad93a0d8ff7c03d33572 SHA512 3e106bf157918b575fc43d565a6a8c0e0be84520d1f7cf9e01254d7da3e9d8c2a820ecff5320c44103f82937f77f91a87341d61ba9baacf604aadd885e30c7d2
+EBUILD fltk-1.3.5-r4.ebuild 4438 BLAKE2B 5acedca36b04560ac847112b0282c8d02a0aa7a68bdb0c525c5bc537864bbc0787f73c02af7bd1800f6f8a5da3769c5cd49ea238d477afe295bd655b34874bf7 SHA512 ff36a591984590fd580775a01d276ee5aa8ecc4bd663057262b3c6a92a1e741994b1e0bad000953539facba513d9d5533484a0b7c3d69a0ab906658f4464ae21
 EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
 EBUILD fltk-1.4.9999.ebuild 4506 BLAKE2B 3891ff70b01adc480baf56abe5de071d177893d0718cb7901b2fec1afdb4a3149644d5c77bdb7c126c890215711c3f17b261fcb686c3c80f4de803a302ba9610 SHA512 2b737473c748d04424a41657875096d78dfef7f96853c27f77554f41b963883ef4d25e82ff415da25be3f7372e5eaba65e707e310c131913ac85f0dc469efb46
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
deleted file mode 100644
index 09427aac2aa5..000000000000
--- a/x11-libs/fltk/files/FLTKConfig.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
-#
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
-
-# The FLTK source tree.
-# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
-
-# The FLTK include file directories.
-SET(FLUID_COMMAND "/usr/bin/fluid")
-SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
-SET(FLTK_LIBRARY_DIRS "/usr/lib")
-SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
-SET(FLTK_INCLUDE_DIRS "/usr/include")
-
-# The C and C++ flags added by FLTK to the cmake-configured flags.
-SET(FLTK_REQUIRED_C_FLAGS "")
-SET(FLTK_REQUIRED_CXX_FLAGS "")
-
-# The FLTK version number
-SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "7")
-
-# Is FLTK using shared libraries?
-SET(FLTK_BUILD_SHARED_LIBS "ON")
-# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
-
-# The location of the UseFLTK.cmake file.
-SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
-
-# # The ExodusII library dependencies.
-# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
-#   INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
-# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
deleted file mode 100644
index 74022a72ffb9..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -100,9 +103,6 @@
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- config.guess config.sub:
- 	-automake --add-missing 2> /dev/null
- 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -84,11 +84,6 @@
- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
- 	fi
- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -96,10 +91,6 @@
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -108,17 +99,11 @@
- 
- uninstall:
- 	$(RMDIR) $(DESTDIR)$(docdir)
--	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
--	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
--	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
- 
- uninstall-linux uninstall-osx:
--	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
deleted file mode 100644
index ef72ba9c3ec2..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fluid/fluid.desktop
-+++ b/fluid/fluid.desktop
-@@ -6,5 +6,5 @@
- Icon=fluid
- Terminal=false
- Type=Application
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Categories=Development;GUIDesigner;
---- a/fluid/x-fluid.desktop
-+++ b/fluid/x-fluid.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=MimeType
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Icon=fluid.png
- Patterns=*.fl
- Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
deleted file mode 100644
index ed487e7dc24d..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/479774
-
---- a/src/Fl_JPEG_Image.cxx
-+++ b/src/Fl_JPEG_Image.cxx
-@@ -155,7 +155,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_stdio_src(&dinfo, fp);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
-@@ -337,7 +337,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_mem_src(&dinfo, data);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
deleted file mode 100644
index 562f1157038f..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Fl_x.cxx
-+++ b/src/Fl_x.cxx
-@@ -2211,6 +2211,7 @@
-   static int result = -1;
-
-   if (result == -1) {
-+    fl_open_display();
-     result = 0;
-     unsigned long nitems;
-     unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
deleted file mode 100644
index f30105e18c06..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/xutf8/utf8Input.c
-+++ b/src/xutf8/utf8Input.c
-@@ -18,6 +18,7 @@
- 
- #include <config.h>
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -53,7 +54,7 @@ typedef struct {
- #include "lcUniConv/jisx0212.h"
- #include "lcUniConv/ksc5601.h"
- 
--static int
-+FL_EXPORT static int
- XConvertEucTwToUtf8(char* buffer_return, int len) {
-   /* FIXME */
- #if HAVE_LIBC_ICONV
-@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucKrToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertBig5ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertCp936extToUtf8(char* buffer_return, int len)
- {
-   int i = 0, l = 0;
-@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertGb2312ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucCnToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucJpToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucToUtf8(const char*	locale,
- 		  char*		buffer_return, 
- 		  int		len, 
-@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char*	locale,
-   return len;
- }
- 
--int
-+FL_EXPORT int
- XUtf8LookupString(XIC                 ic,
- 		  XKeyPressedEvent*   event,
- 		  char*               buffer_return,
---- a/src/xutf8/utf8Utils.c
-+++ b/src/xutf8/utf8Utils.c
-@@ -21,6 +21,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- 
- /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
- 
-@@ -29,7 +30,7 @@
-  * Returns the byte length of the converted UTF-8 char 
-  * Returns -1 if the UTF-8 string is not valid 
-  */
--int
-+FL_EXPORT int
- XConvertUtf8ToUcs(const unsigned char     *buf,
- 		  int                     len,
- 		  unsigned int         	  *ucs) {
-@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int 	ucs,
-  * returns the byte length of the first UTF-8 char 
-  * (returns -1 if not valid) 
-  */
--int
-+FL_EXPORT int
- XUtf8CharByteLen(const unsigned char     *buf,
- 		 int                     len) {
-   unsigned int ucs;
-@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char 	*buf
- /* 
-  * Same as XConvertUtf8ToUcs but no sanity check is done.
-  */
--int
-+FL_EXPORT int
- XFastConvertUtf8ToUcs(const unsigned char     *buf,
- 		      int                     len,
- 		      unsigned int            *ucs) {
---- a/src/xutf8/utf8Wrap.c
-+++ b/src/xutf8/utf8Wrap.c
-@@ -20,6 +20,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/Xlib.h>
- #include <ctype.h>
- #include <stdlib.h>
-@@ -705,7 +706,7 @@ XUtf8_measure_extents(
- /*****************************************************************************/
- /** returns the pixel width of a UTF-8 string				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8TextWidth(XUtf8FontStruct 	*font_set,
- 	       const char 	*string,
- 	       int 		num_bytes) {
-@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct 	*font_se
- /*****************************************************************************/
- /**  get the X font and glyph ID of a UCS char                              **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XGetUtf8FontAndGlyph(XUtf8FontStruct  *font_set,
- 		     unsigned int     ucs,
- 		     XFontStruct      **fnt,
-@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct  *f
- /*****************************************************************************/
- /** returns the pixel width of a UCS char				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8UcsWidth(XUtf8FontStruct  *font_set,
- 	      unsigned int     ucs) {
- 
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
deleted file mode 100644
index 32dcd3016349..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1005,13 +1005,13 @@
- 	AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
- 
- 	xft_found=no
--	if test x$enable_xft != xno; then
--	    AC_PATH_PROG(FTCONFIG, freetype-config)
--
--	    if test "x$FTCONFIG" != x; then
--		CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
--		CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
--		CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+	AS_IF([test x$enable_xft != xno], [
-+	    PKG_PROG_PKG_CONFIG
-+	    PKG_CHECK_MODULES(FREETYPE, freetype2, [
-+		CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
-+		CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
-+		CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
-+	    ],AC_MSG_ERROR([No freetype found]))
- 
- 		AC_CHECK_LIB(fontconfig, FcPatternCreate)
- 		AC_CHECK_HEADER(X11/Xft/Xft.h,
-@@ -1019,8 +1019,7 @@
- 			[AC_DEFINE(USE_XFT)
- 			 LIBS="-lXft $LIBS"
- 			 xft_found=yes] ))
--	    fi
--	fi
-+	])
- 
- 	dnl Issue a warning message if Xft was not found, abort configure
- 	dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
deleted file mode 100644
index 6fecfbecb1e3..000000000000
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fdo-mime flag-o-matic ltprune
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	cairo? ( x11-libs/cairo[X] )
-	games? ( !sys-block/blocks )
-	opengl? ( virtual/glu virtual/opengl )
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	rm -rf zlib jpeg png || die
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
-		"${FILESDIR}"/${PN}-1.3.0-share.patch \
-		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
-		"${FILESDIR}"/${PN}-1.3.3-visibility.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
-		"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
-
-	use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-}
-
-src_configure() {
-	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C documentation html
-	fi
-
-	if use games; then
-		emake -C test blocks checkers sudoku
-	fi
-}
-
-src_test() {
-	emake -C test
-}
-
-src_install() {
-	default
-
-	emake -C fluid \
-			DESTDIR="${D}" install-linux
-
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install
-	fi
-
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux
-		emake -C documentation \
-			DESTDIR="${D}" install-linux
-		apps+=" sudoku blocks checkers"
-	fi
-
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
deleted file mode 100644
index b8168ff96996..000000000000
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	x11-libs/libICE[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
-	games? ( !sys-block/blocks )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.4-freetype_pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	cp fluid/{,x-}fluid.desktop || die
-
-	eaclocal
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset FLTK_LIBDIRS
-
-	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
-
-	multilib_is_native_abi && use prefix &&
-		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xcursor \
-		--enable-xdbe \
-		--enable-xfixes \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-multilib_src_compile() {
-	# Prevent reconfigure on non-native ABIs.
-	touch -r makeinclude config.{guess,sub} || die
-
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid
-		use doc && emake -C documentation html
-		use games && emake -C test ${FLTK_GAMES}
-	fi
-}
-
-multilib_src_test() {
-	emake -C fluid
-	emake -C test
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid DESTDIR="${D}" install-linux install
-
-		use doc && \
-			emake -C documentation DESTDIR="${D}" install
-
-		use games && \
-			emake -C test DESTDIR="${D}" install-linux
-	fi
-}
-
-multilib_src_install_all() {
-	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym \
-			/usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 30f91c3198fd..56edcb354e2f 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="