gentoo auto-resync : 27:12:2024 - 06:30:34

19 files changed, 171 insertions, 849 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1d79476d6446..212226fd883b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index adcd6a1ff917..796ba35b8d92 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,20 +1,11 @@
 AUX fltk-1.3.0-share.patch 1843 BLAKE2B aff10c9f4ebf2512b89d641505d25a948bfcc594755139a592b9bb60a578e0e04f001362d43576fbe8719134e475db27409a125114d246a1ed702b2ccb43ece1 SHA512 d6c60614bc92125675758c1dbc635bd336282cef56844fe5c9de61c006a35359e521e01cda3ae20788f37f964d35b802e7ab286f4d5e10ca7e65a02955067af4
-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.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
-AUX fltk-1.3.5-AR.patch 291 BLAKE2B ffbca85e658a3e5615bd69ab10a6f2e740746fd2c56d0d4675edc37ab1866ba5c100fe33e6bf00897f17facd5e2ee806395869739a50e1c9f21d220ed36b4045 SHA512 4a10020e145466974aa624cdbc1b175507ecda5e733a0ec1fb6525f953bc474a4f942916fda49c3b04eb5bfc3197547f2c5c2535d61672206087a6d89cc4c8d9
-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
-AUX fltk-1.4.9999-cmake.patch 673 BLAKE2B 1332768f0a52f495e25c9b69b3c69cc94f986cd6a3a255df0405c3d069ae6ae8481a38b7d5dfbfa358172501db987b12e9978c2199a21d2b5f3974b235f343c2 SHA512 5851218248a15752cfa2b1759dd73843e9da9785c4ba7327126d62437e8497b23d6aa4a3a7d1b07a068de8be1b84d3fcbe4e1eb5c8ed50d9bb451ffbca942c5a
-AUX fltk-1.4.9999-conf-tests.patch 1799 BLAKE2B b5527fd6d2b43f26157d9c676908021b19adc54034f1f1f90be4cc05aefa0325e8e03fe2ce1d6d1bed286864bcf0846e6e5f19be846245f7e9f1c648ca34db20 SHA512 015aa4ab6394974995d20d358d25fb2569a1453a20f3d28636eddda7ee030ce97d002ed2b1c6d0c5234e67207e1c8b1c00577939215ee33509f84cab8339dd8e
-AUX fltk-1.4.9999-makefile-dirs.patch 369 BLAKE2B 103f9ea921257c99e6b08f03f8ad32869530f051bcc62434d285d5c9c87bcce362eb6f1889af2553086fed36d3d38791171f6722835a59df7162cd0715543fe9 SHA512 a7f12ef75c22670e83dc172a9ac669fb5584416c3457f4ff22d0da17f5c1b263e89020ab715b8b919f0dd3a128a6bfe611001f70077e166ab85721cea53810d1
-AUX fltk-1.4.9999-optim.patch 342 BLAKE2B d76931d951083fa76c60569508ef6726a1e9307f3fb5e901a4eca78eb4b6ef0a260feef9bd29f91e324281f2ded87decb21cdbde9c5078ecce7f9fa815ea8122 SHA512 8f2337014933ef1db03477d017dc3c905bf4d2cbc3e62e49e40a6d03b3f38fe00d38eb31912245555ac2e5a28580b38b22532797f237e43b5fe98e204428cd4c
-DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
+AUX fltk-1.4.1-fltk-config.patch 881 BLAKE2B 1426e584e6978e62cf3c2e1fb2fd3f19ef4e0743dda9a2ee6dc02b14f83ce9cfa168f8367d15e62675b1c096b171cd9afb6bae8600bcaeb52fcf04c6e3dbb906 SHA512 d2a409b36e744931f84977927e0a4994b88d8eb875303d9bd4c498d031b99c04e5404093000769c658ba5a6f4ab66ed5d8a4f9e21ce28571565905855904d76e
+AUX fltk-1.4.1-tests-odr.patch 417 BLAKE2B c27f150429540742094c975941da0a8c6bbf14522516c74a6245d99ea68947b79f6e771e001f1c6dd50aff9e1806cb5c87e5a40e1acd3204dc06b7b94aa98f6d SHA512 5a683d35f6c30c2f0e973658cd39737defcf14360dcd9a76715c33806836029e4d0c25bb56bf7266be60fa88d41d0a9bbf4a54dd5d914fe78e8f05800959f374
 DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb
-EBUILD fltk-1.3.5-r4.ebuild 4573 BLAKE2B ed5841c5f7d744c80894b61985503e370456a88fccd7e476eb99a84a19e06a00a46fdf4199b42c1ea01615f525b140e8fb3be46ba55b02452b9ba905b724a97c SHA512 a06a3f06844814e823aeeff45c3a8ed11412b96cd62eb7f39d42ceeb177035f956b60b9418e3139baf61c48c624fb61103cb6d8e6468cc054b335c58e9967b1a
-EBUILD fltk-1.3.8.ebuild 4426 BLAKE2B b4b31923aeed44abddf667b8994efdd799b71e6d9bbf4edd144a39767d1bdd6727103e817721d0b0231b90ca519ca0647b6667acfd5d0cf054752cf03526ec94 SHA512 68343e761ed951837119e82194baf4bf6fa563d42dcde9df596b931feecb3eaf9ff84c71bcb85c3761e9596c1fda6b7bbc726ef1d3d1c514edaf671a24fccc72
-EBUILD fltk-1.3.9999.ebuild 4575 BLAKE2B 925ddd0a48d88ab18c48373372c4636b477e462116254d3de69bb855f2d35fcc04f89303ea0370ee324233ea59c135e91249477fa5b71b8c8cbc0a3cebc0b2ef SHA512 7eebba378da3d889cf820531f3aef42b8755ce4274dc16f891d42939dea656d18f57972ebbaed78f630b8f10e62d25acc9ac2307e3b8fe22a4d701bf0040f78b
-EBUILD fltk-1.4.9999.ebuild 4375 BLAKE2B f72287f281ef2994be864b118d01de1fb15577a8ab8f002bfd178848eab2a463524499a37021441dc9354300313123ae94e73620b20ce190e7907b3b58ff3059 SHA512 bdfd6123d363bc3a2a7453a247325970f348eb2ae2a043394880381aa5b26b904cd29bcd3cc501e9754a5a6904a3f1c534b83475d73a0548666a835517a2cc24
-MISC metadata.xml 657 BLAKE2B 3b8149138859276ea23b72969afbcae32725a2a2cb541b802cc37caa0621b8161cc3ba6f944ceddea5c5ae547b2a57ca344f4558648452e23f62182c65232140 SHA512 764bd4333938568be347da22d16ec023e86d5b0ae78754db195fade0d34830933ca4a768e538a29a29c9c7a765cd1828d6d76a4f021e2aa8dbbc56d21f883777
+DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037
+EBUILD fltk-1.3.8.ebuild 4426 BLAKE2B c08668458fc4a7abf7864c9d3d4fa58aea40dfcd3011b2fc49ef4c2d727035c0e5e710f74cdbeb593dcf3d3b586f36aef8f16392c147f5c543b9ee3b1b1c6b94 SHA512 4e96c70ad070a9079e835f160cceccf2aaf9e949e437db286de132ea93e4b344e5f3c68a1ab2825740cbde0fc163d87b71bbdb5d6f8b7159caab945fe6700e03
+EBUILD fltk-1.4.1.ebuild 2547 BLAKE2B 7895622a4c5c840f644cbf91813d577ca14fd49ce6884d3c35984004b7b1961343cf0f361cd4cabb3bdfd4fb37a99e45a205f3c7ce8f758413bacfc166ef2981 SHA512 d9308c63945d2ceaa5b52bffd3bc444ab46c7a346135f73eb8ca5fa6a0547f30ff1142ed5d21a18a787cb1a859c2a791e3764d21443a4b8db92a95487c3f04a6
+MISC metadata.xml 748 BLAKE2B 97d56d582c951d85c702882af8ad52f78878b52b6dbde2f18d2fc5c0c383638dbd6de5526e27105cab6f2ec1fe0bf4a6c7107b9bb9d478972a3183fb6f86536c SHA512 b91a98e1216b43f3fba9dbe044b01c01fa31a926699ea38fddb61b3de04b8b39cdaaa1dff8d6b66d2f309c01a3a800eed9cfd8e8c1119c1be418ae2416259852
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
deleted file mode 100644
index ca7607afa4fc..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/fltk-config.in
-+++ b/fltk-config.in
-@@ -42,9 +42,8 @@
- 
- # flags for C++ compiler:
- ARCHFLAGS="@ARCHFLAGS@"
--CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
--CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
--LDFLAGS="@LDFLAGS@"
-+CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
-+CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
- LDLIBS="@LIBS@"
- OPTIM="@OPTIM@"
- CAIROFLAGS="@CAIROFLAGS@"
diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch
deleted file mode 100644
index 34dbc8769f09..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.5-AR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen)
- 
- dnl How do we make libraries?
- AC_PROG_RANLIB
--AC_PATH_TOOL(AR, ar)
-+AC_CHECK_TOOL(AR, ar)
- 
- if test "x$AR" = "x:"; then
-     AC_MSG_ERROR([Configure could not find the library archiver, aborting.])
diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
deleted file mode 100644
index 1eac250248d2..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,6 +57,7 @@
- FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
- FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
- FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
-+FLTK_VERSION_FULL=${FL_VERSION}
- 
- AC_SUBST(FL_MAJOR_VERSION)
- AC_SUBST(FL_MINOR_VERSION)
-@@ -64,6 +65,7 @@
- AC_SUBST(FL_DSO_VERSION)
- AC_SUBST(FL_ABI_VERSION)
- AC_SUBST(FL_VERSION)
-+AC_SUBST(FLTK_VERSION_FULL)
- 
- AC_SUBST(ARCHFLAGS)
- AC_SUBST(OPTIM)
-@@ -1576,10 +1578,13 @@
- BINARY_DIR=
- AC_SUBST(BINARY_DIR)
- 
-+INCLUDE_DIRS="${includedir}"
-+AC_SUBST(INCLUDE_DIRS)
-+
- dnl Write all of the files...
- AC_CONFIG_HEADER(config.h:configh.in)
- AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)
--AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
-+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
- AC_OUTPUT
- 
- dnl Make sure the fltk-config script is executable...
diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
deleted file mode 100644
index 4d1512d749dd..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.5-optim.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1265,7 +1265,7 @@
- 	if test "x$with_optim" != x; then
- 	    OPTIM="$with_optim $OPTIM"
- 	else
--	    OPTIM="-Os $OPTIM"
-+	    OPTIM=" $OPTIM"
- 	fi
-     fi
- 
diff --git a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch
deleted file mode 100644
index 994df56ad361..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.9999-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.ac
--	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.4.1-fltk-config.patch b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch
new file mode 100644
index 000000000000..ee933b46b4df
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch
@@ -0,0 +1,25 @@
+The "CFLAGS" variable here concatenates user's CFLAGS (unwanted in
+fltk-config's @CFLAGS@) and FLTK_CFLAGS a bit below (wanted).
+
+So prevent addition of CMAKE_C_FLAGS_* and keep the rest.
+
+CXXFLAGS not touched given it does set(CXXFLAGS "${CFLAGS}").
+
+Also drop @LDFLAGS@ as a precaution, it's not currently set by cmake
+but it's likely an oversight. @LARGEFILE@ (currently still in .in) and
+such are only used by autoconf (cmake appends into @CFLAGS@).
+--- a/CMake/variables.cmake
++++ b/CMake/variables.cmake
+@@ -139,6 +139 @@
+-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER)
+-if(${BUILD_UPPER})
+-  set(CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}")
+-endif(${BUILD_UPPER})
+-
+-set(CFLAGS "${FLTK_OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}")
++set(CFLAGS "${FLTK_OPTION_OPTIM} ${CFLAGS}")
+--- a/fltk-config.in
++++ b/fltk-config.in
+@@ -38 +38 @@
+-LDFLAGS="@LDFLAGS@"
++LDFLAGS=""
diff --git a/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch
new file mode 100644
index 000000000000..7243efa21fcd
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch
@@ -0,0 +1,9 @@
+We only use the unittests-shared example and this unused one has ODR
+violations. Skip building it for now rather than filter-lto w/ tests
+to avoid triggering -Werror=odr -flto CI (ideally would want to only
+build unittests and not have to worry about build time + quirks of
+all examples).
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -100 +99,0 @@
+-fl_create_example(coordinates coordinates.cxx fltk::fltk)
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
deleted file mode 100644
index 3f576d501ece..000000000000
--- a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6b64110b0..1330d3f27 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility)
- BINARY_DIR=
- AC_SUBST([BINARY_DIR])
- 
-+INCLUDE_DIRS="${includedir}"
-+AC_SUBST(INCLUDE_DIRS)
-+
- dnl Write all of the files...
- AC_CONFIG_HEADERS([config.h:configh.in])
- AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in])
--AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
-+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
- AC_OUTPUT
- 
- dnl Make sure the fltk-config script is executable...
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
deleted file mode 100644
index 47db8d03c8d2..000000000000
--- a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2d99808d9..283f825dd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.ac
--	autoconf
--
- portable-dist:
- 	epm -v -s fltk.xpm fltk
- 
-diff --git a/documentation/Makefile b/documentation/Makefile
-index 0b176246b..882fbf8a4 100644
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -91,12 +91,6 @@ install: $(MANPAGES)
- 	  $(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_MAN) $(SRC_DOCDIR)/fltk-options.$(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
-@@ -105,10 +99,6 @@ install: $(MANPAGES)
- 	$(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
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
deleted file mode 100644
index e49aa7408cca..000000000000
--- a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c02de0972..2d99808d9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,8 +16,7 @@
- 
- include makeinclude
- 
--DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
--       documentation
-+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
deleted file mode 100644
index a1e18bbb74b2..000000000000
--- a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1330d3f27..c76dba26f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [
-         AS_IF([test "x$with_optim" != x], [
-             OPTIM="$with_optim $OPTIM"
-         ], [
--            OPTIM="-Os $OPTIM"
-+            OPTIM="$OPTIM"
-         ])
-     ])
- 
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
deleted file mode 100644
index 69b47fc0d881..000000000000
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic xdg-utils 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 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-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-text/doxygen )
-"
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CHANGES_1.0
-	CHANGES_1.1
-	CREDITS
-	README
-	README.abi-version.txt
-	README.Cairo.txt
-	README.CMake.txt
-	README.MSWindows.txt
-	README.OSX.txt
-	README.Unix.txt
-)
-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.5-cmake.patch
-	"${FILESDIR}"/${PN}-1.3.5-optim.patch
-	"${FILESDIR}"/${PN}-1.3.5-AR.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
-
-	# 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() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/881107
-	# Seems to be fixed in git (1.4.9999)
-	filter-lto
-
-	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} \
-		DSOFLAGS="${LDFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-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 \
-			../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
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild
index af7fb86ee352..d9363b758188 100644
--- a/x11-libs/fltk/fltk-1.3.8.ebuild
+++ b/x11-libs/fltk/fltk-1.3.8.ebuild
@@ -9,8 +9,8 @@ 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"
+SLOT="1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
deleted file mode 100644
index 8362de128971..000000000000
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-EGIT_REPO_URI="https://github.com/fltk/fltk"
-EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS=""
-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-text/doxygen )
-"
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CHANGES_1.0
-	CHANGES_1.1
-	CREDITS
-	README
-	README.abi-version.txt
-	README.Cairo.txt
-	README.CMake.txt
-	README.MSWindows.txt
-	README.OSX.txt
-	README.Unix.txt
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.5-cmake.patch
-	"${FILESDIR}"/${PN}-1.3.5-optim.patch
-)
-
-pkg_setup() {
-	unset FLTK_LIBDIRS
-}
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	sed -i \
-		-e '/x-fluid/d' fluid/Makefile || die
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/881107
-	# Seems to be fixed in git (1.4.9999)
-	filter-lto
-
-	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} \
-		DSOFLAGS="${LDFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-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 \
-			../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
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-libs/fltk/fltk-1.4.1.ebuild b/x11-libs/fltk/fltk-1.4.1.ebuild
new file mode 100644
index 000000000000..c783579112e2
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo xdg
+
+DESCRIPTION="Fast Light GUI Toolkit"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://github.com/fltk/fltk/releases/download/release-${PV}/${P}-source.tar.bz2"
+
+LICENSE="FLTK LGPL-2 MIT ZLIB"
+SLOT="1/$(ver_cut 1-2)" # README.abi-version.txt
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X +cairo doc examples opengl static-libs test wayland"
+REQUIRED_USE="
+	|| ( X wayland )
+	wayland? ( cairo )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	sys-libs/zlib:=
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		!cairo? (
+			media-libs/fontconfig
+			x11-libs/libXft
+			x11-libs/libXrender
+		)
+	)
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/pango[X?]
+	)
+	opengl? (
+		media-libs/glu
+		media-libs/libglvnd[X]
+	)
+	wayland? (
+		dev-libs/wayland
+		gui-libs/libdecor
+		sys-apps/dbus
+		x11-libs/libxkbcommon
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	doc? ( app-text/doxygen )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-fltk-config.patch
+	"${FILESDIR}"/${PN}-1.4.1-tests-odr.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# fluid can optionally use html docs at runtime, adjust path
+	sed -i "s|\${FLTK_DOCDIR}/fltk|&-${PVR}/html|" CMake/export.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFLTK_BACKEND_WAYLAND=$(usex wayland)
+		-DFLTK_BACKEND_X11=$(usex X)
+		-DFLTK_BUILD_FLUID=yes
+		-DFLTK_BUILD_FLUID_DOCS=no
+		-DFLTK_BUILD_GL=$(usex opengl)
+		-DFLTK_BUILD_HTML_DOCS=$(usex doc)
+		-DFLTK_BUILD_PDF_DOCS=no
+		-DFLTK_BUILD_SHARED_LIBS=yes
+		-DFLTK_BUILD_TEST=$(usex test)
+		-DFLTK_GRAPHICS_CAIRO=$(usex cairo)
+		-DFLTK_OPTION_STD=yes # will be removed & forced ON in fltk-1.5
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc docs)
+}
+
+src_test() {
+	# same that upstream's CI does except with the shared version
+	edo "${BUILD_DIR}"/bin/test/unittests-shared --core
+}
+
+src_install() {
+	local DOCS=(
+		ANNOUNCEMENT CHANGES* CREDITS.txt README*
+		$(usev examples)
+		# simpler than using -DFLTK_INSTALL_HTML_DOCS for the location
+		$(usev doc "${BUILD_DIR}"/documentation/html)
+	)
+	cmake_src_install
+
+	# currently no option to disable building static libs
+	use static-libs || rm -- "${ED}"/usr/$(get_libdir)/*.a || die
+}
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
deleted file mode 100644
index 74b44b10b0b6..000000000000
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-EGIT_REPO_URI="https://github.com/fltk/fltk"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS=""
-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-text/doxygen )
-"
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES.txt
-	CHANGES_1.0.txt
-	CHANGES_1.1.txt
-	CHANGES_1.3.txt
-	CREDITS.txt
-	README.CMake.txt
-	README.Cairo.txt
-	README.IDE.txt
-	README.Unix.txt
-	README.Windows.txt
-	README.abi-version.txt
-	README.macOS.md
-	README.md
-	README.txt
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.4.9999-cmake.patch
-	"${FILESDIR}"/${PN}-1.4.9999-optim.patch
-)
-
-pkg_setup() {
-	unset FLTK_LIBDIRS
-}
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	sed -i \
-		-e '/x-fluid/d' fluid/Makefile || die
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	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} \
-		DSOFLAGS="${LDFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-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 \
-			../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
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index cc385decf7fd..9c84f80f4c14 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<longdescription>
-	The Fast Light ToolKit is a cross-platform C++ user interface
-	toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
-	functionality and supports 3D graphics via OpenGL and its built-in
-	GLUT emulation. FLTK also includes a UI builder called FLUID that
-	can be used to create applications.
-</longdescription>
-<upstream>
-	<remote-id type="github">fltk/fltk</remote-id>
-</upstream>
-<use>
-	<flag name="games">Builds and installs some extra games</flag>
-</use>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<longdescription>
+		The Fast Light ToolKit is a cross-platform C++ user interface
+		toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides
+		GUI functionality and supports 3D graphics via OpenGL and its
+		built-in GLUT emulation. FLTK also includes a UI builder called
+		FLUID that can be used to create applications.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fltk/fltk</remote-id>
+	</upstream>
+	<use>
+		<flag name="games">Builds and installs some extra games</flag>
+	</use>
 </pkgmetadata>