gentoo auto-resync : 03:09:2024 - 12:28:20

21 files changed, 305 insertions, 167 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d68a2e0b07d6..56690b20fe6b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 70c3250fa84b..79ac22a5decb 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,5 +1,7 @@
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
+DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141
 EBUILD cairo-1.18.0.ebuild 2696 BLAKE2B 5ad605b4c25b0547e7054196037f3879fcc270e2b5a28a32967bb9d9c1973e5d898970503164b7613b94a2673d853aa23db9c3eef2fb44f48799c756002fa94b SHA512 0081b5a19fc1db43a00d5e17d7f792b3da6b82422545eea04f8218c71db34c8cec91fc0f44623c02aefd4cc0688d4199f6f2ee8ce0a8acc67dca1f46217b78ae
-EBUILD cairo-9999.ebuild 2671 BLAKE2B 22b6c97303f3f60e8556ba3677028d96a4beb6cd1e5304ffdd69165fd61858e78b5f936cc204bea01d82ffd22773f7b8cb3ac3e4d9f3d3a3c81d172cc81d734e SHA512 3a4b259eeec228135716af950c88701f9af34e4609ab1f78e2afec2401a587715611b346a735dd8d0be10fea5230ca646d8a58addcfe752209e6ec0787d95018
+EBUILD cairo-1.18.2.ebuild 2703 BLAKE2B 5b8e885cf7473649b374d3d8ec40c8c72f76b46d995d44e04cb5438a281f5c9c9d4e5da31790c0b7dfcd71bddc1493c942178560f22e81d0bc4638c8a76e8eee SHA512 2f0d01dbde1390d5b3d9e9a13ede6761e1d535ba24eddd8b1ca4b85dc9c0b189552a86d6b8194c252108752ef94fd7ac0f28c77a2b87de953a5f304651f33bc0
+EBUILD cairo-9999.ebuild 2703 BLAKE2B 5b8e885cf7473649b374d3d8ec40c8c72f76b46d995d44e04cb5438a281f5c9c9d4e5da31790c0b7dfcd71bddc1493c942178560f22e81d0bc4638c8a76e8eee SHA512 2f0d01dbde1390d5b3d9e9a13ede6761e1d535ba24eddd8b1ca4b85dc9c0b189552a86d6b8194c252108752ef94fd7ac0f28c77a2b87de953a5f304651f33bc0
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.18.2.ebuild b/x11-libs/cairo/cairo-1.18.2.ebuild
new file mode 100644
index 000000000000..1d57ad8c8bdc
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.18.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+else
+	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}]
+	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl
+		app-text/poppler[cairo]
+		gnome-base/librsvg
+	)
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddwrite=disabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dpng=enabled
+		$(meson_feature aqua quartz)
+		$(meson_feature X tee)
+		$(meson_feature X xcb)
+		$(meson_feature X xlib)
+		-Dxlib-xcb=disabled
+		-Dzlib=enabled
+
+		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
+		$(meson_native_use_feature test tests)
+
+		-Dgtk2-utils=disabled
+
+		$(meson_feature glib)
+		-Dspectre=disabled # only used for tests
+		$(meson_feature debug symbol-lookup)
+
+		$(meson_use gtk-doc gtk_doc)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && meson_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+		rmdir "${ED}"/usr/share/gtk-doc/html || die
+	fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f51355062fef..1d57ad8c8bdc 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
@@ -24,11 +24,11 @@ RESTRICT="test !test? ( test )"
 
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}]
 	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	X? (
@@ -54,6 +54,7 @@ PATCHES=(
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Ddwrite=disabled
 		-Dfontconfig=enabled
 		-Dfreetype=enabled
 		-Dpng=enabled
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 917b6557d09c..a42622201547 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,5 @@
 DIST libFS-1.0.10.tar.xz 293016 BLAKE2B 305d4343f84389805c9eb04e176fa9b291e784cf8636dfde929370ad9ffa66d63956afc643ca53cce22163bd54e5f222e44cb956e55e43a24dd3594c9bfc8ea9 SHA512 f4dc361b7e1dcc1f348ea86e96c5a60ff40c5168b6097f00d8a5db2b86d089cfca12ac13dbde5ce3b53279b7eb8773ed6dcd9c678c2e95363ffa5127ecaacee7
 DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8
-EBUILD libFS-1.0.10.ebuild 414 BLAKE2B 776bba092127b4b8d1dc6c575b27e47519f0b7d7468727e56900aff00c5ac8000a6481e9a99aece44962029004350d3dfc09b60b4bfed2fe09e9db882df290ca SHA512 79c831f22ce05d4553ad1bd729269a13a9abbb71baea67081ceb4133e625de7104533623a688d19f8c0c1bb34925575548d19f35df0b10f3953c0a852a0f30fd
+EBUILD libFS-1.0.10.ebuild 410 BLAKE2B 033a3871cd1e0426da0c2b4beeb966f36b6c4c4f697ce379d0f113057a346459e18d24e7a1023cb6f99d89df313225b5f8122e647c2895fa42f8b55bc9be1666 SHA512 66ba7a06795e0f9fe94e5bcb017d4a94e4614ef3b6244a36930e2e67e6cbde753694f822cc216f4949c231b384fb6dc1e7ae6386dc422a18f00204027ce1a705
 EBUILD libFS-1.0.9.ebuild 408 BLAKE2B 90e5efe8b55d23cae411c78f51f6a4520ac4b2fa9bfc2e142df2804ff215a6a8224a34f57ebe749bf457d4409a63a972b92f688e2166553c1a95421ef28fee11 SHA512 ba9f0f9404540c1e3e31548e4cf23afb2dedbb0d28cd1abe3eab5ff0a1ab9617a466eebcd9e39eff01b8991f1ac55c2aff1b5d08693529fe00b28b4b6f0ecd34
 MISC metadata.xml 336 BLAKE2B 63758b2250f1678012f938bfb7826c03e447991e3aba5c233e16df68dbaae033b1f14d77833c85238efe0eedd90314f5e8b2e1cfcac824bd5a034e7e575f244f SHA512 f2b85263c274822c779720160b79a4c243896f7169c9aa88181ed805c3f5808cd48aec07eeb0e2faedfb1b3ef467846243e2cfec925e8eeafb58f6d228a3aac1
diff --git a/x11-libs/libFS/libFS-1.0.10.ebuild b/x11-libs/libFS/libFS-1.0.10.ebuild
index 6723c0cad72c..79fc74be259c 100644
--- a/x11-libs/libFS/libFS-1.0.10.ebuild
+++ b/x11-libs/libFS/libFS-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 DEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 00f35fe0d24c..f34256c6624b 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,5 +1,5 @@
 DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd
 DIST libXfont2-2.0.7.tar.xz 453012 BLAKE2B d20001c0e7ce90e0efea25f17d09d5671b0dafacfe7d34dfd3eabe377d75899f3eea6e266d043e8d917ff38585e778ddcb4179f0cbfe15845e4d8584f154eaad SHA512 f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0
 EBUILD libXfont2-2.0.6-r1.ebuild 859 BLAKE2B 5ec03158ef6d264a6806aa3c727169f9150f35c388db4d46c8667990216ce1991969844d67c69e6f4fad836929fa49e1102db482bec63b975dc55bbdfa9b0e55 SHA512 858bbbcaa094b000edd69ecebaca8245276a84dfbc923809d666e7f37a7e4b57f7d81449b1ec61fcd5cb79594a9d2fdc832da37d38265b8d9db8b5cb7d0c66d6
-EBUILD libXfont2-2.0.7.ebuild 867 BLAKE2B e2a0edb60300d78877ea9b0b5db6cda98cca7443bdee7cad0356e7dc7912509d8e08035468c6c753ad4fcee98c14eebf3fbbf8cf065d0aee8163e6eec5dbcb92 SHA512 a6c14e59cac670bbe5d1347c02ac08fb1f3279215935b7f8553b275e4083fcd842d88e0f0d0af93f2c3fe8ce3fc59062c67196772198a9d70e55dacd3215a659
+EBUILD libXfont2-2.0.7.ebuild 863 BLAKE2B f1b9ac95dd7a423d6519634fa6ffdbffa7fcae728a6d589da40aadf06389e1c803e18e0e81b3cf2a29df723e0c1c9855d2f75dd9f3428646d606d82043e29203 SHA512 2defa27d8e55436db1cfac9c7893ba1b1e94d8c27953dea841b52636a1caddd096c858f662a341a2334dabd0450f93a188296a33c701554f23c56bbb5f2e0c0f
 MISC metadata.xml 574 BLAKE2B 7dd74ab652b5e72d852ab5e826d9025c8a81d1eb475d7b936e87f5baf9a726275475cf1e016816165c4a12b124b3fa238b84093c29115b98fcfd196181a4ed11 SHA512 788a597733e4defd54b0a4667b9b83a04991b3519442d2cb180ca1eb775c76c3936be572820d84b1c8db568b59d1288cc03e362a68ccd1e544042acc8b7af550
diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
index a99af0682a7e..c85dc0addeaa 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index af270dbbfcca..34e336157c8b 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,5 +1,5 @@
 DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d
 DIST libXtst-1.2.5.tar.xz 291748 BLAKE2B daf9d3c5412623a06c8579b341c1ab6e720719c4f3151acf5c735ea08c79c33800993d55cd9f9e8660be85e290fac641e5e9266deb4d317d9957ced847b1ebb1 SHA512 848fa580d7abccd48c9ca3440f92e299839ada0912ed60d38d4d4f5bf37431cd02d7059265ab4e524c3e2cb9c368b9b90b863d1ed97d74979ef8811fc5e635a9
 EBUILD libXtst-1.2.4.ebuild 596 BLAKE2B 09cbeeab6c53a75fea271b6a9ac9ed796e134ce9874977fa1c3b5c2e2c437df4c198d164f928d318d38ae0c7180b6c2876ca135c2b5cd60c540f902d7298b83b SHA512 9707a10b201c38c94e59103364db241f927a9ec2430b4ee6a1df9dada4205dd582ee67ad7e8dc9bcd4953f0e93eef22b9212f8beb1bdd0beacb910ccf2002c4d
-EBUILD libXtst-1.2.5.ebuild 603 BLAKE2B f1fa5dff96b3d6da7caf55513b41f60309c072622ca4f6ad854760aa4ac5249f65eb20df01825e4918f8efbbf6ee686a27dce0394eedae904742ea227d92a5ed SHA512 547b89a7b9322dd71289effd4e0362e65e01b8b540b63521d2a298a46d20fdd85f45cedb024649d593af3c45df63c0ba81da7d6f0d03bf7e8be2ac0c5d566d6b
+EBUILD libXtst-1.2.5.ebuild 599 BLAKE2B 48d307ac3cfe02c2243bc7c6bbaadbf6a8ff1b2c7d933602fe46007dfe14898826d9c201de18df70fc29a0fc03bd308ef415f40c35c0f5046c4e59bf25c5eeb6 SHA512 b384c92bfe282e44c400bcd20610c4f312d14bf69af70d8cfec8b9c9ae96d3b59cb3188c091a383641d4bf88797150ae192957f3e43b5b779974f465aee7e832
 MISC metadata.xml 338 BLAKE2B 87a7a857c72d92a698c6ca2b9d6274b3a03edda1e5b4b84cb66f6c581f1ac428a7ad912c7c63ecc2554bda3c84fcaeeff108504237562499452934ef6ae4cf49 SHA512 6957dbdc6e6fe3186ff4ef7979cbf1f237ee942c1c6b3534b2833db2a799e765c244f1d6531f20d97011cb8901939dffc43e34d8f22ce4d977730fcff51f3e23
diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild
index bc2419f863b0..c013d72eb18d 100644
--- a/x11-libs/libXtst/libXtst-1.2.5.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 9ef394408257..bab78ec5c13f 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,9 +1,6 @@
-AUX libdrm-2.4.120-backport-pr353.patch 1533 BLAKE2B 8beab698e4ad2ed48b45d05d266668b54e538d460d757d856599adfdbe8f72812865bad7ca065e56ebeaed46dd73531460cae816faf62cdb3043e615d23dc7ea SHA512 f04f9132966e66f946e17df86479c723ee2cc26046adea9519179dc91c335dbdd9142ee91fbd31a491dca386a050e63ea8debecf21b2d79b8b01d214cb44ec97
-DIST libdrm-2.4.120.tar.xz 479564 BLAKE2B 218d674da334c32aae27a31c10992cb276b08543704c875c7d7bf8f3dd348d1cf1c95f35b0afc8f3034d83152c2df460f84807388a21b241792db3e81c98dbfc SHA512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70
-DIST libdrm-2.4.121.tar.xz 480840 BLAKE2B 23b8c68e12e5d3ed34dcf9577ef934e7990526018f76933a35434c7ea69ba081850e2d4e00e783880bcfe570d62910161364515ce8fde715743abbcb39d3ffb4 SHA512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e
 DIST libdrm-2.4.122.tar.xz 481012 BLAKE2B ca6aaf0fe55dfcfe33a0d39a7b3ea07aa4cbe772294ec7f419a4edbb40cbce14c399e180e35dd781ef225a16daae8f40d4893599eb018b68cc78e4e981f2e6e2 SHA512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13
-EBUILD libdrm-2.4.120.ebuild 2504 BLAKE2B 5eedee47428f90d087f504967d815c8ebdc267d95d494782487f72665e9a7f6a21320b2f26ff4636f0653f27f41f5bb207adcb3a5ee0eef53aaab9c7087e8e1b SHA512 cfd79db679571f5917292f0bd3ff5a035c4eaaf515071d1eb55f8cb8fd33c36cf94a3563420df6d3b8f444582aab6d337e8c7ed2f136be953635b6e38ece42e2
-EBUILD libdrm-2.4.121.ebuild 2443 BLAKE2B f02a2fa57b2e768b237b79d5ef99234d7cc36a801d6b01e9fd22958791af004ebb74aa876b1f41c5a502307f023593c4c9ecc9d01d22558acbf6cec5f6489a8d SHA512 05fa9ff23e026f61c225c71dbee0d84c7cdb92cb55729e5b8b6843f37696f1ea5f89f1ed5e9bb73eaae7eaeaae36c8d71d9d59dc8170c059037b9289d5f9f973
-EBUILD libdrm-2.4.122.ebuild 2443 BLAKE2B f02a2fa57b2e768b237b79d5ef99234d7cc36a801d6b01e9fd22958791af004ebb74aa876b1f41c5a502307f023593c4c9ecc9d01d22558acbf6cec5f6489a8d SHA512 05fa9ff23e026f61c225c71dbee0d84c7cdb92cb55729e5b8b6843f37696f1ea5f89f1ed5e9bb73eaae7eaeaae36c8d71d9d59dc8170c059037b9289d5f9f973
+DIST libdrm-2.4.123.tar.xz 481112 BLAKE2B 5a621682ef32bb9b9b69b153a36db4b85df54595ade9910091ff62a477ea30fc9e7f22ab5d9b8c8a5f9f1cf428cb400b5e62f3cf811227666de718ddd8cdcc34 SHA512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d
+EBUILD libdrm-2.4.122.ebuild 2442 BLAKE2B 398724594c0de46d7350f6dfbe38d53e45e1372727437406c845b4468bb8215d0790306377db713236f231b4f19fd9c5223cc36cdd70448ba97b2b919ec66a8c SHA512 d8ea03faab45ffbe2d920994a671d88e61fd4f4a495f6e59e3f9c7753ccb201cc73ac04f659f056391bad2b0228a60b4023446fc996bb15f5dde6e90adf6de8c
+EBUILD libdrm-2.4.123.ebuild 2450 BLAKE2B e0d5de54f588cc447a40615c57ad7bdade9ffcf88cc7e824097740f45f61c9eaa18806b204111cd476c6ff84d16f553ffbb22372c856e52193fbbffbb9f6410d SHA512 3994ffcfcf06ea86d998112d8e4112164921a8371971fb79837ea9904e0cab425c81a54584333764ff1a7f0f2b9505fe2791f9a7e4f293ace8adfd586a15b7c5
 EBUILD libdrm-9999.ebuild 2450 BLAKE2B e0d5de54f588cc447a40615c57ad7bdade9ffcf88cc7e824097740f45f61c9eaa18806b204111cd476c6ff84d16f553ffbb22372c856e52193fbbffbb9f6410d SHA512 3994ffcfcf06ea86d998112d8e4112164921a8371971fb79837ea9904e0cab425c81a54584333764ff1a7f0f2b9505fe2791f9a7e4f293ace8adfd586a15b7c5
 MISC metadata.xml 410 BLAKE2B 86cda23d38e7b6f3581545fcd036c4d6233380e3a61b3ad8a94b8fef4eb8ae3f3a9bd4680b0cac219c0decd4c2df58bf731fce668787b0b3bf7d88f054110a8d SHA512 5c10acae8f229f49f789c0447988a4a48cb2f7de996b9d0a68fe67c0a217d405bc4face3be503562210da7f480a17aebd64d6ae9b38d8d2ff2dc031c41b438d5
diff --git a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch b/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch
deleted file mode 100644
index 1d01db322a8c..000000000000
--- a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/927204
-https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/353
-
-From 525e80447fee011734af464b3b5d478b2b7b17af Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 22 Mar 2024 11:20:17 -0400
-Subject: [PATCH 1/2] symbols-check: Add _GLOBAL_OFFSET_TABLE_
-
-This is exported on hppa/parisc.
-
-See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978
-
-Bug: https://bugs.gentoo.org/927204
----
- symbols-check.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/symbols-check.py b/symbols-check.py
-index 2e7ba68d1..47bc3bead 100644
---- a/symbols-check.py
-+++ b/symbols-check.py
-@@ -7,6 +7,7 @@ import subprocess
- 
- # This list contains symbols that _might_ be exported for some platforms
- PLATFORM_SYMBOLS = [
-+    '_GLOBAL_OFFSET_TABLE_',
-     '__bss_end__',
-     '__bss_start__',
-     '__bss_start',
--- 
-GitLab
-
-
-From c45ffb1edf19faff79238934abe01fd92e9e3d0a Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 22 Mar 2024 11:21:39 -0400
-Subject: [PATCH 2/2] symbols-check: Add _fbss, _fdata, _ftext
-
-These are exported on mips/mips64.
-
-See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11955
----
- symbols-check.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/symbols-check.py b/symbols-check.py
-index 47bc3bead..c63c0d112 100644
---- a/symbols-check.py
-+++ b/symbols-check.py
-@@ -17,6 +17,9 @@ PLATFORM_SYMBOLS = [
-     '_end',
-     '_fini',
-     '_init',
-+    '_fbss',
-+    '_fdata',
-+    '_ftext',
- ]
- 
- 
--- 
-GitLab
-
diff --git a/x11-libs/libdrm/libdrm-2.4.120.ebuild b/x11-libs/libdrm/libdrm-2.4.120.ebuild
deleted file mode 100644
index 009f5144834f..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.120.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )"
-RDEPEND="${COMMON_DEPEND}
-	video_cards_amdgpu? (
-		tools? ( >=dev-util/cunit-2.1 )
-		test?  ( >=dev-util/cunit-2.1 )
-	)
-	udev? ( virtual/udev )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}/${PN}-2.4.120-backport-pr353.patch" )
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		symbols-check.py || die # bug #925550
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use udev)
-		-Dcairo-tests=disabled
-		$(meson_feature video_cards_amdgpu amdgpu)
-		$(meson_feature video_cards_exynos exynos)
-		$(meson_feature video_cards_freedreno freedreno)
-		$(meson_feature video_cards_intel intel)
-		$(meson_feature video_cards_nouveau nouveau)
-		$(meson_feature video_cards_omap omap)
-		$(meson_feature video_cards_radeon radeon)
-		$(meson_feature video_cards_tegra tegra)
-		$(meson_feature video_cards_vc4 vc4)
-		$(meson_feature video_cards_vivante etnaviv)
-		$(meson_feature video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto disabled)
-		$(meson_native_use_bool tools install-test-programs)
-	)
-
-	if use test || { multilib_is_native_abi && use tools; }; then
-		emesonargs+=( -Dtests=true  )
-	else
-		emesonargs+=( -Dtests=false )
-	fi
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.122.ebuild b/x11-libs/libdrm/libdrm-2.4.122.ebuild
index 75538252e16f..ac5c686719d3 100644
--- a/x11-libs/libdrm/libdrm-2.4.122.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.122.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.121.ebuild b/x11-libs/libdrm/libdrm-2.4.123.ebuild
index 75538252e16f..3f5e53d9399c 100644
--- a/x11-libs/libdrm/libdrm-2.4.121.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.123.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 341648c3971c..28d2aff0d3e1 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -1,6 +1,10 @@
 AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac591c6e107dbda4d9876e93070142e2b8809db93efcf7866cc2adfb1df6e5ad39bb27575e260669606a5c882be13b37 SHA512 0fbbb49dd9dcb5571591ef214fc5318f8a4b09966a8cac6b94d17e1554747714d4aa79387fde970d0e83804397f5fe7e9988ec82164023ab3d2562397ba31308
+AUX xbae-4.60.4-c99.patch 616 BLAKE2B df43e5fb1917e29f00f7b9d69df7a0564bb25fb27cac23ebd78db24477281f451a2fa4d3a12bcc36b7d870c239e3447de6d0c7f3b77fcd47f0b10a98148b1964 SHA512 0dfd293552629076fe09d9dd41ff0b8992c3dc3d16df6501b4f568d2df67fa541c23febbd0c34fab9acb0a7bc93169f5d184ee479abb9b40417efe94b94d455b
+AUX xbae-4.60.4-configure-c99.patch 1686 BLAKE2B beab19070e946eab6eb4e4887db7ec307171e930bda9506f81102e7ddc9637fadb3b6d1264abcd9c86bdcb9d7f9ad6b1424af974b1d30ac1662c88fda4d3a468 SHA512 8e82c59fbc6ee08896094aeef97f2ff29b35bc117299dd23128c19276c30186bbe8e1d4df14c77c12febbaf805cdb2da729bc1683fc2e4950bf01b352e0927c1
 AUX xbae-4.60.4-lxmp.patch 364 BLAKE2B c7defbca432abd679c5afbab2e95de3270097617d7a52cf4c781d3d44e36887c18901a045d9ca36d107aa71343e7f1ce974ec0634062318a56c14351335e8425 SHA512 90a348e0f67b3954ce2c1965e4252ef5b1be9b0c6c232981219a79af5a705dcc09bada6e87b7a2ae25e9d9220130c1321af90d079843317cc82d8e2a11dd78fa
+AUX xbae-4.60.4-modern-autotools.patch 1056 BLAKE2B 37dd68c32bb8a80f950b5279120c249b13bf9b246e803f7bb15f38597330f35741091ace012c634562b3453c058060c09025e8b864ff65014f6e795d5fdb4af6 SHA512 d9105973404546719ba83e117afbd8a50b22bc002d01ba95b923b6175687f2d353aba2c0f8d19e6f64ef68a4d6e1f907f089c8c2b83e7a23be6ea3a4f0fa564d
 AUX xbae-4.60.4-tmpl.patch 182 BLAKE2B fb68a556359b2825879567ad53e4fcdcb3f5d41198cc8f3bb7626e45251881b8b7e7ebc4f244c4df0973d21e62a797d38b7a429dc94ca84a97700a4f2f9055d8 SHA512 dc360679441f2c8a4642a8b12b624acc739e4e7bd4ccb931d385212e418291eaf8d05501a420cb0407ab953826cd477634938c1b3fb89b3aa5ea1fefa57a8a60
 DIST xbae-4.60.4.tar.gz 1770938 BLAKE2B c9790dae438a4a35ca58274d96b3d4cdcf61191e3c8336e7df3df419a64a790bd010890f88082add21c304ec520ddec3545915c5babf267bd9ebb985b0acf0f4 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16
-EBUILD xbae-4.60.4.ebuild 1255 BLAKE2B 71f68f742942e25d060214a6be5635de45b9a623dd479fdcf00aaa3685f7592bf922bffe574fb6037a87476889c601891e6dce6cca48c04b6fa0758b6ab3bad5 SHA512 30f41835d24119ad1f4360fe194872f9edce80b3150edfc59df3b53a4660e70dc3ed82ffb4205f8d5b6749d1f7dc4b446906285692c896d709d3e44a85ad11a7
+EBUILD xbae-4.60.4-r1.ebuild 1494 BLAKE2B c9e0ea20460b8b8a2fe31f2eb21989a17f8e36f793a8be9a1ad3657ba3320e1a21ee2071298555b68d0f87ca20d56e815031f5c7b516d6b9a24b18100081d25a SHA512 b06570da805ab12dfda038821a546bb0e747041820666c26f90b60b9b51fc963a4eef4d595f4c241389391b271af601696a55d8a8a619b5d276c900252dfc99b
+EBUILD xbae-4.60.4.ebuild 1256 BLAKE2B becb33b8efc523bcca8514d9e64b43959c62d27d7851c6185f9d4465d2ddd0b7a72f78ffba2b223407d256538ca86a64ed2892bafc161720e920630b8afa2ebe SHA512 c0eb82d72a639167720ca80e68809ac05805f81e5c3fe53812489a1cbf58b3595017eb8a73d601000f6070583b1e44064027db169cf9cb2f14188cb533f3f0dd
 MISC metadata.xml 966 BLAKE2B edf4afe356cada257f2c1421d8c3f647ed4ebd4f32e2537a75c681f91cd08edd8328e92eef088bd3e77a8b47c1390920a4cc43697ff34e5e5004d3947353caa1 SHA512 d605fc363f55d3a6db056d2d35b8481ea6c1e900fe3416e11a0295e5cc2a4ad4e63a2b04b027dc544d43d09e54b8d8bce1647f73283f82353f61247360a50d86
diff --git a/x11-libs/xbae/files/xbae-4.60.4-c99.patch b/x11-libs/xbae/files/xbae-4.60.4-c99.patch
new file mode 100644
index 000000000000..8c50dad3030d
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-c99.patch
@@ -0,0 +1,24 @@
+From bbfc674fc85c874560c784bd8076be7c9b3b5f43 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 1 Sep 2024 22:33:09 -0400
+Subject: [PATCH] c99 porting: fix UB from not including headers
+
+---
+ examples/matrix/matrix.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/matrix/matrix.c b/examples/matrix/matrix.c
+index 1d3e1df..3fbecf6 100644
+--- a/examples/matrix/matrix.c
++++ b/examples/matrix/matrix.c
+@@ -28,6 +28,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <XbaeConfig.h>
+ #endif
++#include <stdio.h>
+ #include <stdlib.h>
+ #ifdef USE_EDITRES
+ #include <X11/Intrinsic.h>
+-- 
+2.44.2
+
diff --git a/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch b/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch
new file mode 100644
index 000000000000..33f108d8d603
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch
@@ -0,0 +1,57 @@
+https://sourceforge.net/p/xbae/patches/3/
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 36b4569680ea8531..0bda82ef7480beaf 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -334,7 +334,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ ],
+ lt_cv_libxp=yes,
+diff --git a/configure b/configure
+index f43d920c33b055ff..5e82cda106a450e8 100755
+--- a/configure
++++ b/configure
+@@ -2937,7 +2937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4120,7 +4120,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4477,8 +4477,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -21418,7 +21418,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ 
+   ;
diff --git a/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch b/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch
new file mode 100644
index 000000000000..ac5ebaa0f8b6
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch
@@ -0,0 +1,28 @@
+From 165c0f9ae086373c5d1659eac1ae14baa2975145 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 1 Sep 2024 22:09:04 -0400
+Subject: [PATCH] port to modern autotools
+
+When listing files to be installed, you cannot double-list them. Modern
+autotools tries to install all of them in one `install` command, which
+is incompatible with installing the same file twice.
+---
+ doc/images/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
+index e6d91dd..79a8eb0 100644
+--- a/doc/images/Makefile.am
++++ b/doc/images/Makefile.am
+@@ -34,7 +34,7 @@ image_DATA=	\
+ 	bg.png updated.png coverplus.png add.jpg \
+ 	caption.png choice.png colors.jpg draw.png fifteen.jpg \
+ 	input.png list.jpg matrix.jpg multifixed.jpg select-push.jpg \
+-	mailbox.png bg.png pricing.jpg LDO.jpg risk.jpg \
++	mailbox.png pricing.jpg LDO.jpg risk.jpg \
+ 	organize.jpg xbasket.png xbum1-2.png xbill2-2.png capfloor1.png \
+ 	capfloor3.png taam.png \
+ 	grohtml-XbaeCaption1.png \
+-- 
+2.44.2
+
diff --git a/x11-libs/xbae/xbae-4.60.4-r1.ebuild b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
new file mode 100644
index 000000000000..0cbb9bab5a3c
--- /dev/null
+++ b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+AT_M4DIR=${S}
+
+inherit autotools
+
+DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
+HOMEPAGE="https://xbae.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/motif:0
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tmpl.patch
+	"${FILESDIR}"/${P}-lxmp.patch
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	# https://sourceforge.net/p/xbae/patches/3/
+	"${FILESDIR}"/${P}-configure-c99.patch
+	"${FILESDIR}"/${P}-modern-autotools.patch
+	"${FILESDIR}"/${P}-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-production
+}
+
+src_test() {
+	emake -C examples
+	emake -C examples/testall clean
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/aclocal
+	doins ac_find_xbae.m4
+
+	if use examples; then
+		find examples -name '*akefile*' -delete || die
+		rm examples/{testall,extest} || die
+		dodoc -r examples
+	fi
+	if use doc; then
+		rm doc/{,images/}Makefile* || die
+		docinto html
+		dodoc -r doc/.
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index 7d79a5fa59f3..69507033ee42 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
-HOMEPAGE="http://xbae.sourceforge.net/"
+HOMEPAGE="https://xbae.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"