summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin17680 -> 17651 bytes
-rw-r--r--x11-libs/agg/Manifest2
-rw-r--r--x11-libs/agg/agg-2.5-r3.ebuild4
-rw-r--r--x11-libs/cairo/Manifest2
-rw-r--r--x11-libs/cairo/cairo-1.18.4.ebuild95
-rw-r--r--x11-libs/fltk/Manifest2
-rw-r--r--x11-libs/fltk/fltk-1.4.2.ebuild113
-rw-r--r--x11-libs/fox/Manifest9
-rw-r--r--x11-libs/fox/files/fox-1.7.85-fix-metaclass-header.patch17
-rw-r--r--x11-libs/fox/files/fox-1.7.85-sanitize.patch31
-rw-r--r--x11-libs/fox/files/fox-1.7.85-tools.patch27
-rw-r--r--x11-libs/fox/fox-1.7.67-r3.ebuild126
-rw-r--r--x11-libs/fox/fox-1.7.85.ebuild (renamed from x11-libs/fox/fox-1.7.84.ebuild)39
-rw-r--r--x11-libs/gtk+/Manifest12
-rw-r--r--x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch57
-rw-r--r--x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch121
-rw-r--r--x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch31
-rw-r--r--x11-libs/gtk+/gtk+-3.24.35.ebuild245
-rw-r--r--x11-libs/gtk+/gtk+-3.24.48.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.41.ebuild)20
-rw-r--r--x11-libs/gtk+/gtk+-3.24.49.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.41-r1.ebuild)13
-rw-r--r--x11-libs/libICE/Manifest2
-rw-r--r--x11-libs/libICE/libICE-1.1.1-r1.ebuild27
-rw-r--r--x11-libs/libSM/Manifest4
-rw-r--r--x11-libs/libSM/libSM-1.2.6.ebuild (renamed from x11-libs/libSM/libSM-1.2.4.ebuild)4
-rw-r--r--x11-libs/libX11/Manifest4
-rw-r--r--x11-libs/libX11/libX11-1.8.11.ebuild47
-rw-r--r--x11-libs/libX11/libX11-1.8.12.ebuild47
-rw-r--r--x11-libs/libXau/Manifest2
-rw-r--r--x11-libs/libXau/libXau-1.0.11.ebuild14
-rw-r--r--x11-libs/libXcursor/Manifest2
-rw-r--r--x11-libs/libXcursor/libXcursor-1.2.2.ebuild23
-rw-r--r--x11-libs/libXrender/Manifest2
-rw-r--r--x11-libs/libXrender/libXrender-0.9.11.ebuild16
-rw-r--r--x11-libs/libXt/Manifest5
-rw-r--r--x11-libs/libXt/libXt-1.3.0.ebuild31
-rw-r--r--x11-libs/libXt/libXt-1.3.1-r1.ebuild2
-rw-r--r--x11-libs/libXt/libXt-1.3.1.ebuild31
-rw-r--r--x11-libs/libXv/Manifest2
-rw-r--r--x11-libs/libXv/libXv-1.0.12.ebuild17
-rw-r--r--x11-libs/libXxf86vm/Manifest2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild18
-rw-r--r--x11-libs/libdrm/Manifest2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.123-r1.ebuild83
-rw-r--r--x11-libs/libfm-qt/Manifest2
-rw-r--r--x11-libs/libfm-qt/libfm-qt-2.1.0.ebuild2
-rw-r--r--x11-libs/libnotify/Manifest2
-rw-r--r--x11-libs/libnotify/libnotify-0.8.4.ebuild71
-rw-r--r--x11-libs/libxcvt/Manifest2
-rw-r--r--x11-libs/libxcvt/libxcvt-0.1.2.ebuild19
-rw-r--r--x11-libs/libxkbcommon/Manifest2
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.8.0.ebuild72
-rw-r--r--x11-libs/libxshmfence/Manifest2
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild13
-rw-r--r--x11-libs/pango/Manifest4
-rw-r--r--x11-libs/pango/pango-1.52.1.ebuild87
-rw-r--r--x11-libs/pango/pango-1.52.2.ebuild4
-rw-r--r--x11-libs/pixman/Manifest3
-rw-r--r--x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch106
-rw-r--r--x11-libs/pixman/pixman-0.43.4.ebuild72
-rw-r--r--x11-libs/qtermwidget/Manifest2
-rw-r--r--x11-libs/qtermwidget/qtermwidget-2.1.0.ebuild2
-rw-r--r--x11-libs/qwt/Manifest1
-rw-r--r--x11-libs/qwt/qwt-6.2.0-r4.ebuild157
-rw-r--r--x11-libs/wxGTK/Manifest6
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild130
-rw-r--r--x11-libs/wxGTK/wxGTK-3.2.5.ebuild4
-rw-r--r--x11-libs/wxGTK/wxGTK-3.2.6.ebuild254
-rw-r--r--x11-libs/xapp/Manifest2
-rw-r--r--x11-libs/xapp/xapp-2.8.8.ebuild117
-rw-r--r--x11-libs/xbae/Manifest3
-rw-r--r--x11-libs/xbae/files/xbae-4.60.4-c23.patch167
-rw-r--r--x11-libs/xbae/xbae-4.60.4-r2.ebuild (renamed from x11-libs/xbae/xbae-4.60.4.ebuild)20
-rw-r--r--x11-libs/xtrans/Manifest2
-rw-r--r--x11-libs/xtrans/xtrans-1.6.0.ebuild21
74 files changed, 1510 insertions, 1194 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4b88aefca17a..571b42b8ec2e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index bb1e7d6ce292..2e82db045a2e 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -22,5 +22,5 @@ AUX agg-2.5-register-keyword.patch 2366 BLAKE2B 2ccf9cec92fa6705a3b0cef385147022
AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r3.ebuild 1419 BLAKE2B 447d011f9e5cf365334ee33f0f0bc64da42489a126ef882334c75e76c9e3971ac2bba102a3c96cc20cbb9e40e1cac5ea233b79118b937510010cf1b5155e1dd9 SHA512 2a8bd0ef7264846e121524d09e4613775d412f04d51eb9d9bdc511b82836e19547a3b16775ee5dd7a4495bdbad349822dd175ba02e0808f2e4a8077f24f5b922
+EBUILD agg-2.5-r3.ebuild 1425 BLAKE2B f5d3aeb93fbc334c4de4467252735844216f8e7bf0418b83495388f692402eda31cfaf57c20edc2bdf8e80eaf7b94770a1d4ca2219adf624e7aad67eca2eee21 SHA512 60333be3d333026883797224c21e9155074e732cf1d4df9ed97db2d726897b75dfbe89a2a53786a1b55050c962c2b58f5a716d6296c5c6b6470759ade4f7f9dc
MISC metadata.xml 336 BLAKE2B 3edd19d4d4c044be6ffe40717135d5800a8c10ed31e52cee361d2b7c0ddbc963e4e14c287852b608e25c2b2e479ccc701f8f25c0a1a800964eb135c27de83f72 SHA512 54d63b066a3b1e1d1f9a9397f8dff5194b5bc463ac8055ca6316e4f2764a522c3d76aaa81c747c24661c4d3d5f5c3b2a3c8810c3e0909ca48095d1d799b7506a
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index b4dbb7fd7b19..645cc49be096 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
LICENSE="GPL-2 gpc? ( free-noncomm )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+gpc sdl static-libs +truetype +X"
# preffer X with enabled xcb, really
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 75d38b7f8c1d..bb5f8fafbce2 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,8 @@
AUX cairo-1.18.2-cups.patch 1181 BLAKE2B 8790ce088616c33312bf54aa3f86a19f80c2f9bfae04e4862cc432d7e5891d167e824ef54716735bf521cecc02a2711a865ae41b5fabc414886dcefbf7bed073 SHA512 9f889cb37e60dfcd483edbc624702bb8b65dbfdbc06bc7077b09672e1c2ec89a2df9a53b84afa8541da67d6be80164bbd39871bd03e01dd510df9793572a398f
AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141
+DIST cairo-1.18.4.tar.bz2 42897394 BLAKE2B 711142573cde2f0b2c4c7731d4de142fe5c199fbf3512a6c5cb83aa0cdeb1877f83c36c6f1d0b28db71dd263f957912149edbb3c537290205a3aed2985dd033f SHA512 27b98a17510b4d6f0187fcb280fea1b47ae31243f6999081a7ac94f8cf3c789c05fa6eb0fe65844808ef9ac11bcd29a4c3688c871a6950d888667840385acf9b
EBUILD cairo-1.18.2-r1.ebuild 2720 BLAKE2B e474b9d9cc9d052146d7e487784af33c5ce3eb6f80266e2f848c21e8d80f8de0d64a85f6e3b75285d0bb044cb178e4edc2a9a5418b14d0688999b8a87caa1f69 SHA512 c6e11ea1ef4c564ec0c8199d72f40e42673a50d8463a809ec6711b64396ac299be75a7fdb9b4c0524747b95c27176b85c599679902edbc7b0b34f5a1fddc7e3b
+EBUILD cairo-1.18.4.ebuild 2697 BLAKE2B 4af7df615f3861bbc661b56ee831d33fde9218cd7b3c28b0f0519c34992820609061c5ee8b8e85f95d9e6be6cf7b8259fe8d7d6e1160216f90d13ab39930562e SHA512 3b6cb001985f1b36b95ea2608bf86dddc2513573632b8fd2ac45727fd1c9036b04dadccc498ce6b3082dfd0e9c227d62dd6147c65c617fb2134cf42c6907c9fb
EBUILD cairo-9999.ebuild 2697 BLAKE2B 66fa4f151a2bdd05110a54982273aeeb080e148715f7e6d2ead0d7574256f3e345521eea7c3340125db606f234d4e8f18b803626beb235869018d4f3bc431257 SHA512 0295111a82323029bebde475485a94252753056017ba551b0b03bcda65d6bd0390932239e6f6f9525ac6d9b9228ab934512aa51745750d782340e087865e671c
MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.18.4.ebuild b/x11-libs/cairo/cairo-1.18.4.ebuild
new file mode 100644
index 000000000000..1c2642b3d560
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.18.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 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 ~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/fltk/Manifest b/x11-libs/fltk/Manifest
index 796ba35b8d92..7fba2984fad9 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -6,6 +6,8 @@ AUX fltk-1.4.1-fltk-config.patch 881 BLAKE2B 1426e584e6978e62cf3c2e1fb2fd3f19ef4
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
DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037
+DIST fltk-1.4.2-source.tar.bz2 8462860 BLAKE2B 4bc4e0cddf41b7173047ce07cee7f9428192058cf25217aa9651fccb422ad2625ac2b9913d9d0cfff12aeefcf289a83c989dbbc4e664331b3c2721e3bba5e5f4 SHA512 65f4546c3b80c48a39cd719a7bdfd8bbb46c670b1606af22ebfaf67a60f1f2b5b01b111c0eea7729506038613c75dcec15efb93607973d3845181e0e8444f81e
EBUILD fltk-1.3.8.ebuild 4426 BLAKE2B c08668458fc4a7abf7864c9d3d4fa58aea40dfcd3011b2fc49ef4c2d727035c0e5e710f74cdbeb593dcf3d3b586f36aef8f16392c147f5c543b9ee3b1b1c6b94 SHA512 4e96c70ad070a9079e835f160cceccf2aaf9e949e437db286de132ea93e4b344e5f3c68a1ab2825740cbde0fc163d87b71bbdb5d6f8b7159caab945fe6700e03
EBUILD fltk-1.4.1.ebuild 2547 BLAKE2B 7895622a4c5c840f644cbf91813d577ca14fd49ce6884d3c35984004b7b1961343cf0f361cd4cabb3bdfd4fb37a99e45a205f3c7ce8f758413bacfc166ef2981 SHA512 d9308c63945d2ceaa5b52bffd3bc444ab46c7a346135f73eb8ca5fa6a0547f30ff1142ed5d21a18a787cb1a859c2a791e3764d21443a4b8db92a95487c3f04a6
+EBUILD fltk-1.4.2.ebuild 2552 BLAKE2B cf0e7f4845cc8a11b6ec858a5838040f4decb241fb8975069d5afe383156ffcd6ec7d18ccd801b443719a29cbd3d2daa78058a9cf4e4d696d623653d0377ea9f SHA512 d7ec03ffcc6c15b7eaab28a1fa8259d7eca28e711069b0b393bb946c57bdd4efd9f0a4e37454ff58c3a0393ebe24253dba814e61c57acfa10ade6eade32d8b54
MISC metadata.xml 748 BLAKE2B 97d56d582c951d85c702882af8ad52f78878b52b6dbde2f18d2fc5c0c383638dbd6de5526e27105cab6f2ec1fe0bf4a6c7107b9bb9d478972a3183fb6f86536c SHA512 b91a98e1216b43f3fba9dbe044b01c01fa31a926699ea38fddb61b3de04b8b39cdaaa1dff8d6b66d2f309c01a3a800eed9cfd8e8c1119c1be418ae2416259852
diff --git a/x11-libs/fltk/fltk-1.4.2.ebuild b/x11-libs/fltk/fltk-1.4.2.ebuild
new file mode 100644
index 000000000000..3524642f7b78
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.4.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2024-2025 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/fox/Manifest b/x11-libs/fox/Manifest
index 53d4a7534f56..5eff5e9deeb9 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,10 +1,11 @@
AUX fox-1.7.67-no-truetype.patch 1424 BLAKE2B 5e43098934e319c64e16e990618c93418c423dc670c9352cf263fce98e317870772d9f7c1ec986ef29daa24f65bf2daf1d5cc443431487891369c2d91a7862b6 SHA512 903e75c6c51fa58036206ba044a7f1d9247999c0a8d722c79cb728f555a42acb1c217be575861b7773444315b628da4d465624b5dc6e40a4f5a6493ec0bc09d5
AUX fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch 890 BLAKE2B 656deaecb94f1c2a550f37aa1007d97af6834374c41cab3b13fafcd87554b95acec0655963896830ead7979b474390dbaefd217b2c72c68c8c14a784d9eaf146 SHA512 3ccdf6ede09bccbf0941892a655c98f3e0de684d7ca721106c53ee5262cd25f2da8efb088bfda0f7cd25607e6b2006f7c9211d20b95a369b1fc58db4cd8fc20d
AUX fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch 937 BLAKE2B 2fa49b121834f040d613d54ceb3f3faddbe4cf48019db13872ef9e89d9479e5d21246d8fb70caae3386b6c8cda2da70274f34b68edf85722e24e61169553a6b3 SHA512 21e851be235682f6e5106990e998ea130452d0717ec86e7316bb3373ff01c968d31ed1e7f1d914c2c3f3131a8ed85a2b701c14d768e27be2792fc4e0eb582b04
+AUX fox-1.7.85-fix-metaclass-header.patch 319 BLAKE2B 5a8cd2d611a5f6e113544668cd922fba2c2ee5dc80029960aba38e8cc543932349687630b5fa3c46cbb2f3e3ad0c7fa976e963de24c4393cff4dc08a2d033946 SHA512 0657d9525b3bdbf3d954c5890f4a5ba10dfc49d2de03034ed6a73f6806527b4c8a0d39150663a878c17e25f530a4e4d41473be3a420babdbc9d38a019992496c
+AUX fox-1.7.85-sanitize.patch 1004 BLAKE2B ed41f04fec530bd233b6cd6b731762d882a6f1c3e75de45e166589d32e4fbcc51fb75ea7ec2d1fbd674fc22f1af741e63018ed65f6578135a55e6aa39197727f SHA512 f63ce0f87b2a9a60feaf8ff5b8e83a6e976f4a5cc35c29d74480f48c3de6fa38f73bea0528180caeeaa85986b04fcf56fbaeabfb1b82e1093fc74a7e61c7fc50
+AUX fox-1.7.85-tools.patch 943 BLAKE2B 6e4410ba768e4cd6555821ea138ef9ea84247cf8ae2f38a949f303f9cd05d55710617a939deab1f8335d405a4ec384a46c89f4a7487d13b54589caf28fbaf2ee SHA512 5cfcb621a88e99fd5d9c677b4e97a7541dd115b0bd0080b8f00751a07d88f85286e56cc55b5d3c9d45781813c06c0cb6bf19fa0271d04e30b9a7592bc9fe3a2c
DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
-DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
-DIST fox-1.7.84.tar.gz 5879987 BLAKE2B 803a698eb5d976a04dd30b03a3c65f840d09e173292b8448dc02905b37ea352d0fe71b4a35f806f7ee2a8b6e6436b0c1dc9185ac3a17ecda3fb63a1b583e7348 SHA512 5590f16272a0630cb49e74e0f591e65886dd81ba1b0121d403fa3689ca8b23a727c75b645b417eb87e67fd0ece465b493146c8bb51d117a6559bb19b1b2b4297
+DIST fox-1.7.85.tar.gz 5912948 BLAKE2B ba9b224212efd91e4643e4f97bfd571802c48bf379239a4f580f820e1f6d8c8d55c321febfd42b4dfc7b366715e893365cd198c4cb9c22c5fb8c525b16b1f888 SHA512 7a67d564c69ddac1a9dec62837943ec7aabd951c72715ac12300f728f0fad3365e39cdbf7fe1ab31e0ae8cf11381d62eaeb3edb64d1773d4cd2279db4fd280d8
EBUILD fox-1.6.57-r4.ebuild 2777 BLAKE2B 0d4e4e4d3010ebd8039eebf6c0818328eeaf04ea2633dd22d05f49144caac0ead87a9570c06c0833940349b78fb45b64c0d907669867e809175cbc054b84a848 SHA512 1ee7125e378bc9ea964215a25bd0ac1d7ca2f91ab23ee2455d7a8a4fbdad61b418b3354ddf91d7ee614d9f657f678b7dd599b934248e1484c2e085f3cd4ae988
-EBUILD fox-1.7.67-r3.ebuild 3655 BLAKE2B 4eec8cd4c5b4fe9a7da723fed8d50842cd68cf13d8b33ffe9b2ef048566fd2d4fcf73bd6b69e3af67d26f7c45105ac7fb2d4b71f2d8aad864b1b9e15b7afe194 SHA512 1187e83b4ee7a8d29ae89020015171b43e62ab0bf324e4ed1c8c0215dcfc9fbed373aa605ced058c72273e7faed64007c0a9aa2731694d5e3b533dc9d118e102
-EBUILD fox-1.7.84.ebuild 2953 BLAKE2B b9adbfcdf47b455ec5b8a8f468a8833b61475ed6ef18c45af246ac82e1d8b383cdba56518ab152777d70ff06d62b51b082df765bc27b27622759003bf774b289 SHA512 5420a0a7094a8497d7e1169bbe0f18c1067522331746635efafd416d6269b78bc17fc14123c8e86c6a84706e5668dc102d8f2b339798606f54f329218a268741
+EBUILD fox-1.7.85.ebuild 2856 BLAKE2B 9c344f4ec0585511c0a55cb2ef26f36d990a306a2d47dad3bf26d38ccc1412a35b58ada357d9a46477d1769f925d3ac099fba7c453b80b798bb1ab637c54ade1 SHA512 1fc6c08b1d5e7a9c44992791ab679998d592eeb41efee17b1913d6705b75f4e83ee27b06ccaf7b6573cececf90f0dfa644e507f7e9d363ad444abb0c0d3e6a82
MISC metadata.xml 353 BLAKE2B e9db8b14c07f63f450153af626408d7007471113ba54acad5aa97aac5258d02fe6702db354cce45ceca20444756f5ceb0c46dbacb6fae28fb06320f24221cbbb SHA512 26adab0c5f6876716fa0c87398e9d4009d162d4d202d0455d987837617316aecf8096b10c2a99a5529f7b9d5a324f9aa386d11d0f22c574114acebd15e30fdaa
diff --git a/x11-libs/fox/files/fox-1.7.85-fix-metaclass-header.patch b/x11-libs/fox/files/fox-1.7.85-fix-metaclass-header.patch
new file mode 100644
index 000000000000..fbd57bc409f7
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.85-fix-metaclass-header.patch
@@ -0,0 +1,17 @@
+fix from snapshot
+prevent:
+> /usr/include/fox-1.7/FXObject.h:54:28: error: ‘FXSelector’ in namespace ‘FX’ does not name a type
+
+--- a/include/FXObject.h
++++ b/include/FXObject.h
+@@ -25,6 +25,10 @@
+ #include "FXCallback.h"
+ #endif
+
++#ifndef FXMETACLASS_H
++#include "FXMetaClass.h"
++#endif
++
+ namespace FX {
+
+
diff --git a/x11-libs/fox/files/fox-1.7.85-sanitize.patch b/x11-libs/fox/files/fox-1.7.85-sanitize.patch
new file mode 100644
index 000000000000..3d8d707509d5
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.85-sanitize.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,9 +67,6 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+
+-# Prevents setting flags.
+-CXXFLAGS=""
+-
+ # More secret source
+ AC_GNU_SOURCE
+
+@@ -145,7 +144,6 @@
+ CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+ if test "${GXX}" = "yes" ; then
+ CXXFLAGS="${CXXFLAGS} -ffast-math -fstrict-overflow -fstrict-aliasing -finline-functions -fomit-frame-pointer -fcf-protection=none -fno-stack-protector"
+- LDFLAGS="-s ${LDFLAGS}"
+ fi
+ fi
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ # For non-gcc compilers, change the options to "no-dependencies"
+ AUTOMAKE_OPTIONS = foreign dist-zip
+
+-SUBDIRS = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel glviewer windows
++SUBDIRS = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel glviewer
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox-config index.html aclocal.m4
+
+ bin_SCRIPTS = fox-config
diff --git a/x11-libs/fox/files/fox-1.7.85-tools.patch b/x11-libs/fox/files/fox-1.7.85-tools.patch
new file mode 100644
index 000000000000..bd28a51ed328
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.7.85-tools.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,10 @@
+ # For non-gcc compilers, change the options to "no-dependencies"
+ AUTOMAKE_OPTIONS = foreign dist-zip
+
+-SUBDIRS = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel glviewer
++if COND_TOOLS
++ INC_TOOLS = adie calculator pathfinder shutterbug
++endif
++SUBDIRS = utils include lib chart doc tests controlpanel glviewer $(INC_TOOLS)
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox-config index.html aclocal.m4
+
+ bin_SCRIPTS = fox-config
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,6 +51,10 @@
+ LT_AGE=`expr $FOX_INTERFACE_VERSION - $FOX_BINARY_VERSION`
+ LT_INIT([win32-dll])
+
++AC_ARG_WITH(tools,[ --with-tools choices are yes, no])
++AC_MSG_RESULT([$with_tools])
++AM_CONDITIONAL(COND_TOOLS, test "x$with_tools" != "xno")
++
+ # Check win32 compile
+ case "$host_os" in
+ *mingw32*) OS_WINDOWS=1 ;;
diff --git a/x11-libs/fox/fox-1.7.67-r3.ebuild b/x11-libs/fox/fox-1.7.67-r3.ebuild
deleted file mode 100644
index 63caa1950d13..000000000000
--- a/x11-libs/fox/fox-1.7.67-r3.ebuild
+++ /dev/null
@@ -1,126 +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
-
-DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
-HOMEPAGE="http://www.fox-toolkit.org/"
-SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
-
-RDEPEND="
- x11-libs/fox-wrapper
- x11-libs/libXcursor
- x11-libs/libXrandr
- bzip2? ( app-arch/bzip2 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- opengl? ( virtual/glu virtual/opengl )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )
- truetype? (
- media-libs/freetype:2
- x11-libs/libXft
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libXt"
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch
- "${FILESDIR}"/"${PN}"-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch
-)
-
-src_prepare() {
- default
-
- sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
- sed -i -e "s:windows::" Makefile.am || die
- sed -i -e 's/register //g' lib/*.cpp || die "Unable remove register keywords from sources under lib folder"
- sed -i -e 's/register //g' shutterbug/*.cpp || die "Unable remove register keywords from sources under shutterbug folder"
- sed -i -e 's/register //g' calculator/*.cpp || die "Unable remove register keywords from sources under calculator folder"
- sed -i -e 's/register //g' glviewer/*.cpp || die "Unable remove register keywords from sources under glviewer folder"
- sed -i -e 's/register //g' chart/*.cpp || die "Unable remove register keywords from sources under chart folder"
- if ! use tools; then
- local d
- for d in adie calculator pathfinder shutterbug; do
- sed -i -e "s:${d}::" Makefile.am || die
- done
- fi
-
- # Respect system CXXFLAGS
- sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
-
- # don't strip binaries
- sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
-
- eautoreconf
-}
-
-src_configure() {
- # -Werror=strict-aliasing (bug #864412, bug #940648)
- # Do not trust it for LTO either.
- append-flags -fno-strict-aliasing
- filter-lto
-
- use debug || append-cppflags -DNDEBUG
-
- # Not using --enable-release because of the options it sets like no SSP
- econf \
- --disable-static \
- $(use_enable bzip2 bz2lib) \
- $(use_enable debug) \
- $(use_enable jpeg) \
- $(use_with opengl) \
- $(use_enable png) \
- $(use_enable tiff) \
- $(use_with truetype xft) \
- $(use_enable zlib) \
- $(use_with profile profiling)
-}
-
-src_compile() {
- emake
- use doc && emake -C doc docs
-}
-
-src_install() {
- emake install \
- DESTDIR="${D}" \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
- screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
-
- local CP="${ED}"/usr/bin/ControlPanel
- if [[ -f ${CP} ]]; then
- mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
- die "Failed to install ControlPanel"
- fi
-
- dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
-
- if use doc; then
- # install class reference docs if USE=doc
- docinto html
- dodoc -r doc/ref
- else
- # remove documentation if USE=-doc
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
- fi
-
- # slot fox-config
- if [[ -f ${ED}/usr/bin/fox-config ]] ; then
- mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
- || die "failed to install fox-config"
- fi
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/fox/fox-1.7.84.ebuild b/x11-libs/fox/fox-1.7.85.ebuild
index ac39a16ca295..6f9721dab57e 100644
--- a/x11-libs/fox/fox-1.7.84.ebuild
+++ b/x11-libs/fox/fox-1.7.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,18 +11,25 @@ SRC_URI="ftp://www.fox-toolkit.org/pub/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE="+bzip2 +jpeg +opengl tiff +truetype +zlib debug doc profile tools"
COMMON_DEPEND="
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
x11-libs/libXrandr
+ x11-libs/libXrender
bzip2? ( app-arch/bzip2 )
jpeg? ( media-libs/libjpeg-turbo:= )
opengl? ( virtual/glu virtual/opengl )
- png? ( media-libs/libpng:= )
tiff? ( media-libs/tiff:= )
truetype? (
+ media-libs/fontconfig
media-libs/freetype:2
x11-libs/libXft
)
@@ -41,26 +48,14 @@ BDEPEND="doc? ( app-text/doxygen )"
PATCHES=(
"${FILESDIR}"/${PN}-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch
+ "${FILESDIR}"/${PN}-1.7.85-sanitize.patch
+ "${FILESDIR}"/${PN}-1.7.85-tools.patch
+ # fix from snapshot-1.7.86. to remove in the next release.
+ "${FILESDIR}"/${PN}-1.7.85-fix-metaclass-header.patch
)
src_prepare() {
default
-
- sed -i -e "s:windows::" Makefile.am || die
-
- if ! use tools; then
- local d
- for d in adie calculator pathfinder shutterbug; do
- sed -i -e "s:${d}::" Makefile.am || die
- done
- fi
-
- # Respect system CXXFLAGS
- sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
-
- # don't strip binaries
- sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
-
eautoreconf
}
@@ -78,11 +73,11 @@ src_configure() {
$(use_enable bzip2 bz2lib) \
$(use_enable jpeg) \
$(use_with opengl) \
- $(use_enable png) \
$(use_enable tiff) \
$(use_with truetype xft) \
$(use_enable zlib) \
- $(use_with profile profiling)
+ $(use_with profile profiling) \
+ $(use_with tools)
}
src_compile() {
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7d3006ade0ff..f5d1adf97a95 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,18 +3,16 @@ AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b
AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
AUX gtk+-2.24.33-Fix-casts.patch 6906 BLAKE2B 80247597a4bb6c84ed71d1c572125c28b2696f8f2571d3816fa44fa744a7cdb2a4cee744906b3172ee88c0d623a1ed0dbfc53c832561e0bc906fec7ebc3621e0 SHA512 0a26e9b726a2233ff5d1c1c2a4be0867c42e5127daf2c8312d68e64aa5e887deed36bb9af755db74c3d7aafd2f45bdec1e03d445d73cda325d73f75a88dfad3e
AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc99d06da9dc0edee3f60a747cdd4ec1ec42ec2d3552d6c29566dbe9a744ad816bfac0d0e798ac60e8a0664b8a94e37e5 SHA512 b9e5f876f35f8f7f1fa07b82d2bd8ebbb4a4e6973e61ac9d9c678b76a8c653ca5b90504407b927e0023f504208a198d790f52cda9601eadff669d62e7db1dd1d
-AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
-AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
AUX gtk+-3.24.36-update-icon-cache.patch 774 BLAKE2B 0e7a5b3612147906c91772f496de25175314b601d7ff91c855902f19cb0081e932cc96a90752ae8aa147c4c80868e8d7b01c5e5044695b7710aecaedbd92d5ec SHA512 b8049f77063ac994a0f2222d9e776dd1038636a0920624b027e891f72dd393b825304190118dafc97c733f56554a41e9ceed4f1069980b2913b7b3f4ace23d83
+AUX gtk+-3.24.48-signal-handler.patch 1004 BLAKE2B fa4109c2fc22a1706dae6c2357a062853fdd1ed553b40c956d0c93952c4c0de3be148e5a65e563de6df5b50b63f0c2bb168524ac94f76545f827ddc4a9b31b57 SHA512 fc0e8076613ce823f50ef52749e7340a7040b369f1379b07d765e4bd587355bfbca5d55bed14c1d0c58387ff5b12c3b29aea7521f8fa8a7c14106ba5937fce2f
AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
-DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98
DIST gtk+-3.24.42.tar.xz 13226980 BLAKE2B 04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9 SHA512 53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643
+DIST gtk-3.24.48.tar.xz 13414436 BLAKE2B d5201f434d2045feb68bf9cdbf1e254eba8377a17fcc1d32daf3298338cd3482b5f26158f1c498d70dc122451da45dfdbcea3a39ecd0b074a3659a362a4eb3ea SHA512 aea1c4e2c5c7415692ffedc238321a58c6fc1a56000694e00f7bfe374c6e52fde89f510c1bcccfe3713f8f645e5a117323186e4bb1cffc62855caa5ab08e6b1f
+DIST gtk-3.24.49.tar.xz 13450556 BLAKE2B c45299fdf6c004c56d6480cbde9ff4dee64e460be6742331b93097e5782591c81decdd4dfbba59bd3f0a72ad26c7919c7363877b4d4b3227ecc246025c29f1b2 SHA512 d8727cff733ae06ea29cf6885d458804167e6e1d2c2e62a2881c39b953c6b1530ec72d14b7295e1148bd96233f7a0baef2ab96688fd1a6f048ec820a1f394a81
EBUILD gtk+-2.24.33-r3.ebuild 9925 BLAKE2B 3b6be759a171e784c78509f185be00b8d6dcfe0bc7a0028d5f5c7c0fd32913bba34da24ee6cf3969ac520ebdf7951cef21f8eb831ecdaedff3518443c0035b01 SHA512 1c50f9419fc460cd74f4aa8ac760f16a8214253d6ee46c9c8a939111799440271ca06f2349edc3bb861cc4358c803412c6a380ab92175965f89cdae7a21d8d8f
-EBUILD gtk+-3.24.35.ebuild 6969 BLAKE2B 6f2dd4fa4285bc425d5d75b6b3b90f5a150c4fb140b9a6d007f6a1634d4052da25705b0a425ee017703af94f71e20b23aa2280e4d001f9cc1b6850394499b4e4 SHA512 4d090b3cdc9fe8d1ed56e6800959ade3a4dcc59dd3ac8a91cb211cda3d4aa7c379173c98763e4cb2acd7977e7fefffeacf235a92b3a9d593cb93a6df73f21e9e
-EBUILD gtk+-3.24.41-r1.ebuild 5975 BLAKE2B 5a161d3dd100bf2d2dc83cbd90eb2504c6c2d07c2dd6fb3e905d3a19d7926bff21159f2b0d7b7b27b8e2ac5fe79a0699304afd0b2b8c5fbd9ffdf523329d1843 SHA512 872673157fee15c748b750091c8707c38152524c20466a4901bfe16ef7346adbb9135f38b7f779c58669598de05ec8c92be8f9edd4e55b35e6a3c6352bf6aa0d
-EBUILD gtk+-3.24.41.ebuild 5692 BLAKE2B 88e0ef98410aa8fc2bb683bdef611dc02c15e6ade888fdfdb6a2016098ff707667505fe92117248971746e51982b853aae3727aedeec132e9a19f344eba2aaf3 SHA512 f2dfe1754a6c41b7cc402783000a86991d382189558a71297cc37ce8e41e722928369b0c0a78eb237165108e946dd133a86acbd1cd5a80b9314711a6093ef0ba
EBUILD gtk+-3.24.42-r1.ebuild 6376 BLAKE2B 910968980a542a6aa1e4b515d536ec18c84dac7f5ef9a0b88eed3e805f4dcbc7fbbad854aaf40d991b7e49d16a0958fff116894c8b7a41f298588b686b3ee85d SHA512 c66027fcb9e22f4d73fe58c6abdefecbabbb520807c7b6b91d09c7df29ec1b4d54fe4860b3446dd681120d97039eaf71dc0ecf38d8f00ac448424c83a70729af
+EBUILD gtk+-3.24.48.ebuild 6474 BLAKE2B 1893f15494cc4625a318c22c72cab9210d37dfd9e304dbeb8c4b8f515cd1ed4d5e31e6aef4300347e0e701807e8fdd2169fbb3fa27a89e74a1554e78361e340f SHA512 993c20d4404b6066a8c7b4f3ca6b736ef7f24b59b9807cd8cb80fee5120fe5d5c8974fee69340922ae8e6fe9c92573d354b36f487daa5dcb98fb0fb7aa9a32bc
+EBUILD gtk+-3.24.49.ebuild 6404 BLAKE2B 448da178ccced62909eb1295614cbc74a1b4d63dafbe17942c1d1c1088f2ad4805366db947ced5ca10dc9dedd4d8c95befc29a10c68f91bcd83eccfba4360b27 SHA512 dee050f5a94e4b5f58f760ee49c8e0bbb2087060157288202ffb67187035ca4a5eee0dcdb61e7c32d6ef1825667bc16db09b8329e26c4c08b2987bf59c4ece4c
MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
deleted file mode 100644
index 8913bc88bd4e..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 16 Jan 2018 09:07:38 +0100
-Subject: [PATCH] Fix libcloudproviders check
-
-Use autotools managed variables and make use of pkgconfig macros.
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 24110386b4..cebe66c2e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend,
-
- AC_ARG_ENABLE(cloudproviders,
- [AS_HELP_STRING([--enable-cloudproviders],
-- [enable libcloudproviders integration])],
-- [cloudproviders_set=yes])
-+ [enable libcloudproviders integration])
-+ ],
-+ [],
-+ [enable_cloudproviders=yes])
-
- if test -z "$backend_set"; then
- if test "$platform_win32" = yes; then
-@@ -1350,17 +1352,15 @@ fi
- # Check for libcloudproviders
-
- CLOUDPROVIDER_PACKAGES=""
--if test "x$cloudproviders_set" = "xyes"; then
-- CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-- if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
-- AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
-- [Define if libcloudproviders is available]
-- )
-- else
-- AC_MSG_ERROR([
--*** libcloudproviders not found.])
-- fi
--fi
-+AS_IF([test "$enable_cloudproviders" = "yes"],
-+ [
-+ CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-+ PKG_CHECK_EXISTS(
-+ [$CLOUDPROVIDER_PACKAGES],
-+ [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])],
-+ [AC_MSG_ERROR([*** libcloudproviders not found])]
-+ )
-+ ])
-
- CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
---
-2.15.1
-
diff --git a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
deleted file mode 100644
index a648ba40f4c8..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac | 2 ++
- demos/gtk-demo/Makefile.am | 2 +-
- demos/widget-factory/Makefile.am | 2 +-
- docs/reference/gtk/Makefile.am | 1 -
- gtk/Makefile.am | 27 ---------------------------
- 5 files changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36dda2ebaf..df9d9b0e9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 4a2f827469..369ba5d3cc 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index c33a6d0a95..291f389f53 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index dc9b80c6c5..bcaa4032c9 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
-
- man_MANS = \
- gtk-query-immodules-3.0.1 \
-- gtk-update-icon-cache.1 \
- gtk-encode-symbolic-svg.1 \
- gtk-launch.1 \
- gtk3-demo.1 \
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 9608ab3355..74792a4b40 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1658,7 +1658,6 @@ endif
- #
- bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
-- gtk-update-icon-cache \
- gtk-encode-symbolic-svg \
- gtk-builder-tool \
- gtk-query-settings \
-@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = \
- $(GMODULE_LIBS) \
- $(GTK_DEP_LIBS)
-
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD = \
- $(GDK_PIXBUF_LIBS) \
-@@ -1698,29 +1694,6 @@ gtk_launch_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(GTK_DEP_LIBS)
-
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
-- $(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
--
--$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-- $(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
-
- files:
---
-2.30.0
-
diff --git a/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch b/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch
new file mode 100644
index 000000000000..40ca24d90093
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gtk/-/commit/32381771b1cfa55770036e525a6c53c70be6c920
+
+From 32381771b1cfa55770036e525a6c53c70be6c920 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 12 Feb 2025 12:16:34 +0100
+Subject: [PATCH] im: Fix signal handler signature
+
+This was causing crashes, probably since 2019 :(
+
+Fixes: #7306
+Fixes: #7331
+---
+ gtk/gtkimmulticontext.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
+index 50363559d7b..2d70cdeda06 100644
+--- a/gtk/gtkimmulticontext.c
++++ b/gtk/gtkimmulticontext.c
+@@ -282,7 +282,8 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
+ }
+
+ static void
+-im_module_setting_changed (GtkSettings *settings,
++im_module_setting_changed (GtkSettings *settings,
++ GParamSpec *pspec,
+ GtkIMMulticontext *self)
+ {
+ gtk_im_multicontext_set_slave (self, NULL, FALSE);
+--
+GitLab
diff --git a/x11-libs/gtk+/gtk+-3.24.35.ebuild b/x11-libs/gtk+/gtk+-3.24.35.ebuild
deleted file mode 100644
index bf161a727c02..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.35.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
- || ( aqua wayland X )
- xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
- media-libs/fontconfig[${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-2.2.0:=
- >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
- virtual/libintl[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
- cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.39:= )
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.21
- media-libs/mesa[wayland,${MULTILIB_USEDEP}]
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
- )
- X? (
- media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
- gnome-base/librsvg[${MULTILIB_USEDEP}]
- >=x11-themes/adwaita-icon-theme-3.14
- vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-libs/gobject-introspection-common
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.48
- dev-util/glib-utils
- >=dev-build/gtk-doc-am-1.20
- wayland? ( dev-util/wayland-scanner )
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
- x11-libs/gdk-pixbuf:2
- gtk-doc? (
- app-text/docbook-xml-dtd:4.3
- >=dev-util/gtk-doc-1.20
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
- "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
-
- # Fix broken autotools logic
- "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-)
-
-strip_builddir() {
- local rule=$1
- shift
- local directory=$1
- shift
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
- || die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
- if ! use test ; then
- # don't waste time building tests
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
- # the tests dir needs to be build now because since commit
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
- fi
-
- if ! use examples; then
- # don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
- fi
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- $(use_enable aqua quartz-backend)
- $(use_enable broadway broadway-backend)
- $(use_enable colord)
- $(use_enable cups cups auto)
- $(multilib_native_use_enable gtk-doc)
- $(multilib_native_use_enable introspection)
- $(use_enable sysprof profiler)
- $(use_enable wayland wayland-backend)
- $(use_enable X x11-backend)
- $(use_enable X xcomposite)
- $(use_enable X xdamage)
- $(use_enable X xfixes)
- $(use_enable X xkb)
- $(use_enable X xrandr)
- $(use_enable xinerama)
- # cloudprovider is not packaged in Gentoo yet
- --disable-cloudproviders
- --disable-papi
- --enable-man
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
- # need libdir here to avoid a double slash in a path that libtool doesn't
- # grok so well during install (// between $EPREFIX and usr ...)
- # TODO: Is this still the case?
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
- )
-
- if use wayland; then
- myconf+=(
- # Include wayland immodule into gtk itself, to avoid problems like
- # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
- # user overridden GTK_IM_MODULE envvar
- --with-included-immodules=wayland
- )
- fi;
-
- ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in gdk gtk libgail-util; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- insinto /etc/gtk-3.0
- doins "${FILESDIR}"/settings.ini
- # Skip README.{in,commits,win32} that would get installed by default
- DOCS=( AUTHORS ChangeLog NEWS README )
- einstalldocs
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}${cache}" "${ED}${cache}" || die
- else
- touch "${ED}${cache}" || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk3 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your settings.ini file."
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.41.ebuild b/x11-libs/gtk+/gtk+-3.24.48.ebuild
index 82d2b4737e10..6192c794e833 100644
--- a/x11-libs/gtk+/gtk+-3.24.41.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.48.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+GNOME_ORG_MODULE=gtk
inherit gnome2 meson-multilib multilib toolchain-funcs virtualx
DESCRIPTION="Gimp ToolKit +"
@@ -18,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
COMMON_DEPEND="
>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
@@ -37,7 +38,6 @@ COMMON_DEPEND="
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39:= )
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
>=dev-libs/wayland-protocols-1.32
@@ -58,6 +58,7 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.33.2:4[${MULTILIB_USEDEP}] )
X? ( x11-base/xorg-proto )
"
RDEPEND="${COMMON_DEPEND}
@@ -95,11 +96,24 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
+ # Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds
+ # with USE="-wayland -X" to trick gtk into claiming that it wasn't built with
+ # such support.
+ # https://bugs.gentoo.org/624960
+ "${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
+ # Backport from 3.24 branch
+ "${FILESDIR}"/${P}-signal-handler.patch
)
src_prepare() {
default
+ # Force sysprof-capture-4 instead of checking sysprof-capture-3 first; either is
+ # fine as far as deps are concerned, as it static links, but sysprof-capture-3
+ # links to glib which would be done statically if there's glib[static-libs],
+ # making the whole of gtk+ static link to glib instead of dynamic linking to glib.
+ sed -i -e "s/'sysprof-capture-3'/'sysprof-capture-4'/g" meson.build || die
+
# The border-image-excess-size.ui test is known to fail on big-endian platforms
# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
if [[ $(tc-endian) == big ]]; then
diff --git a/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.49.ebuild
index 500b29dc74ed..ffc81beba2b6 100644
--- a/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.49.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+GNOME_ORG_MODULE=gtk
inherit gnome2 meson-multilib multilib toolchain-funcs virtualx
DESCRIPTION="Gimp ToolKit +"
@@ -18,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
COMMON_DEPEND="
>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
@@ -37,7 +38,6 @@ COMMON_DEPEND="
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39:= )
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
>=dev-libs/wayland-protocols-1.32
@@ -58,6 +58,7 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.33.2:4[${MULTILIB_USEDEP}] )
X? ( x11-base/xorg-proto )
"
RDEPEND="${COMMON_DEPEND}
@@ -105,6 +106,12 @@ PATCHES=(
src_prepare() {
default
+ # Force sysprof-capture-4 instead of checking sysprof-capture-3 first; either is
+ # fine as far as deps are concerned, as it static links, but sysprof-capture-3
+ # links to glib which would be done statically if there's glib[static-libs],
+ # making the whole of gtk+ static link to glib instead of dynamic linking to glib.
+ sed -i -e "s/'sysprof-capture-3'/'sysprof-capture-4'/g" meson.build || die
+
# The border-image-excess-size.ui test is known to fail on big-endian platforms
# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
if [[ $(tc-endian) == big ]]; then
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index ff6b89e33d2d..32e14860807c 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,5 +1,3 @@
-DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3
DIST libICE-1.1.2.tar.xz 342900 BLAKE2B 8dbfb61382009397260415a68a74dd27e277815b22000a617fc688cf12257293de8e29a69df91e88dcae93e14f193bf653ed8dee747b4c2bf5493a509ed9b937 SHA512 340f51ffa1f14ed442ab8bcea92dd63df147c48242e232e818cafe02f43de7ab6e99c5430b9cb8d0dc661295239d2b3f6bdb6a092ce51a98afa06235257e9b1f
-EBUILD libICE-1.1.1-r1.ebuild 596 BLAKE2B 2ebc8265c4a17bbd85b32039a71bb792537fa06ff7049de1f03b226020e9a2b93ab610e4ce5565cbac89f7d3ec3c9a8cf3aa3bdd245d5b34b00d988ddd4a9317 SHA512 3f48144f0d0a05c5ac64fcc0fc8f46334ef393c0cb71c3398e4036898b0e8355b99c93be54c74592d2887820bafc1acc76c3bbef33ab9e66fc4d57e13e197d77
EBUILD libICE-1.1.2.ebuild 596 BLAKE2B f9440ce5ca9ab28f0aeb604c97e7714bf39f50155302fcc3b2a92492936b6b0b4a9fa53c6510ae238f7db0260aca46fc2a5e6ab2424e4801d6fa9772c7666e4e SHA512 9bad83ef72e91287c864b19745f737d0dce550fbdfe9d1151f1219f77d935dcc32350fd993c1f5b884e9004175c1bf24bacb65f6b083b95d3aa08b13e6f2ee3d
MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/libICE-1.1.1-r1.ebuild b/x11-libs/libICE/libICE-1.1.1-r1.ebuild
deleted file mode 100644
index 0ad7ffc51e51..000000000000
--- a/x11-libs/libICE/libICE-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- elibc_glibc? (
- || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/xtrans
-"
-
-XORG_CONFIGURE_OPTIONS=(
- --enable-ipv6
- --disable-docs
- --disable-specs
- --without-fop
-)
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 6267c2f21873..a1581da2a39e 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,5 +1,5 @@
-DIST libSM-1.2.4.tar.xz 306944 BLAKE2B c1944cd8e25389cffc18e9f6e46e3543381a2d74036cff2c24f063c1defca001c94055ef278dc468123b1f60f145df5daf34bcec39875ad918b664a3c279777a SHA512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86
DIST libSM-1.2.5.tar.xz 312708 BLAKE2B 9babbc5409037d1292c85c0b23ff21975f614e9cfe53c6878761e67489815862a98ef84a2249161279fd5d7af7ff886cfbafb63b82832ee142e513e3d359e6cd SHA512 f2e58503a7cd144a610621104b4727878dd5ba0cdf8220e72f27a3474c9b49c01dc514c60cbdfb35a9318f307b27a601580725cef0f6b5091d4c4ea57cef8c91
-EBUILD libSM-1.2.4.ebuild 1648 BLAKE2B 134dd63b7bd5e9d73a815933f81fa2ab8a4005799f6585ca198730ed8dac69753f725b69454e0de43331479fb712d73addc522b2e98d1fe953e56cabf202192b SHA512 5f37b91ad078df215517228d1d199ac9ce6cd2738c72bb5e072f3d1b6e1b3f125b1861c0936d7629927841906ca696b4f7682236c1ec800d822e2c4bc045ee45
+DIST libSM-1.2.6.tar.xz 314040 BLAKE2B 9511d1bb8ec49e9cb55e473d777c75a535ec4e82924653c2ef47bb17dbec75df5a2a20453f72dc158a52666b7edbc67af289eab3cfabe49b6aaf803e13225e42 SHA512 e544a1dc49a03390f76af35837bfd01f749b806d88d3ee806f20311c47ff53d0aeea4744feb875958031b17d50b57a89dcc41d81241c09333c88b268c44653a7
EBUILD libSM-1.2.5.ebuild 1648 BLAKE2B 8f75353b95b7435256e265c42d49f9588896f3ed1fffa20e4616e03ac00b2b15bd476899a3691af05ac1d777755c381badf0544566100cfb6bd03e051611f448 SHA512 050bc181aa685d2cb56e07dd4047b88915e3cdd6f3767a1a36e263c594a8ad9425f9f49b3fa0e901dc32c0b86153f3fc0c8f5f2c29ccd462666cc28cbb03c73e
+EBUILD libSM-1.2.6.ebuild 1656 BLAKE2B 305cabaaba5a4c242f60d8cf0e4d50bef0ce08537d75ade35af88fc125d4823edb3fe4fde2cef658fab7642c90b2fd31d23e58f0b0b48c0d7f7c9e4d710c0466 SHA512 c0e1262bb3502c66f9c823159c54caf71894956650e25da2250e42cbbb0f3b24c420842305c185f2b818adb375210149f250d992c5a7bfe78310558011fd6dd6
MISC metadata.xml 457 BLAKE2B 895411214399309db731cd3f1c5c49ec5a505aa4a7a03e9fc39e7027b1956aeae7b0ffebe1d6f4500eaba907c0aa2ce7332f56de0b53ebc26dd000835a29c9ce SHA512 9e810808a715e91e939d710c5633675d4a7d74b2a18d8054d1932f6022bf186ae981b1ffffd81893bb1959923ddf541908a24656e7c308589994178dbab9ff60
diff --git a/x11-libs/libSM/libSM-1.2.4.ebuild b/x11-libs/libSM/libSM-1.2.6.ebuild
index ee83ca5eaaca..c1b7f732af16 100644
--- a/x11-libs/libSM/libSM-1.2.4.ebuild
+++ b/x11-libs/libSM/libSM-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-3
DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+uuid"
RDEPEND="
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index fbae89736ec0..974226bdee72 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,7 @@
DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1
+DIST libX11-1.8.11.tar.xz 1817652 BLAKE2B e557548d6acaa417a87600c10f1e295ae0fbb13460f7641260f59fc175e9b7de76b4c398981d76b11a52a055f26b233a2ceb44ebb8076d793eb047c2d178573a SHA512 4e2191258039ad0ea7fe5d22b8b0ab5e1d101b20fa4cd0fb44c5e1ac8b2ffbb3a0ad80ac3a67a3803ca30b972476b739a0c244b2ac8b7de6a32b06dc4e2c674b
+DIST libX11-1.8.12.tar.xz 1895256 BLAKE2B f4bdb69abb2add723ca84832ef35f239659228c1f5a3f53631f0d4d4afa7030512b9ba65479464f3efecca0e09d1f758e3b92b139dd5e716fac1b8caaf5bb98d SHA512 cb7a284d9081a8b67f7d8568d56dc403a4b787e46ac497b07768d236084c01f80f4ea2ebd814f950ac9738adc3baea3912932fc333858195c4f8217744b6f730
EBUILD libX11-1.8.10-r1.ebuild 1286 BLAKE2B f44c2c48a4d44f711b5d6f58f0e24560911cf11e5fc960895c352df64b689bcea6be81e2c22a547addf997906529b01db56844c7e02cf6e06edeeb70ecb1dab4 SHA512 29e2b4d78ff884e37acfdba2a9599ca7f6f2038b4cb1c66c7512a930094cc02011777718b3b71c24a5025450028628d192f482e1ffbcbbd99523d8481afd07d9
+EBUILD libX11-1.8.11.ebuild 1294 BLAKE2B 43a9c825105b3be932eb537c57faa666fd70737f4afe64cad4f7f3fb5c30b4385067563b30be700c0518a059b1096a2fef06e6b30ce47b2771f8553562a02016 SHA512 b8ce4f52134465e76c0131c4c2c354897e796530e32070849379cabd70396de62ceadacd6c52e3370e81aca3e0519e519ac137124a43fbf2b2f221b1aa294a74
+EBUILD libX11-1.8.12.ebuild 1294 BLAKE2B 43a9c825105b3be932eb537c57faa666fd70737f4afe64cad4f7f3fb5c30b4385067563b30be700c0518a059b1096a2fef06e6b30ce47b2771f8553562a02016 SHA512 b8ce4f52134465e76c0131c4c2c354897e796530e32070849379cabd70396de62ceadacd6c52e3370e81aca3e0519e519ac137124a43fbf2b2f221b1aa294a74
MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/libX11-1.8.11.ebuild b/x11-libs/libX11/libX11-1.8.11.ebuild
new file mode 100644
index 000000000000..ab1b66de4aa5
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.8.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# HACK: libX11 produces .pc files that depend on xproto.pc. When libX11
+# is installed as a binpkg, DEPEND packages are not pulled in,
+# but to build source packages against libX11, xorg-proto is
+# needed. Until a "build-against-depend" option is available in
+# ebuilds, we RDEPEND on xproto. See bug #903707 and others.
+RDEPEND="
+ >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ x11-misc/compose-tables
+ x11-base/xorg-proto
+"
+DEPEND="${RDEPEND}
+ x11-libs/xtrans
+"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ --enable-ipv6
+ --without-fop
+ --with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+ CPP="$(tc-getPROG CPP cpp)"
+ )
+ xorg-3_src_configure
+}
+
+src_install() {
+ xorg-3_src_install
+ rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libX11/libX11-1.8.12.ebuild b/x11-libs/libX11/libX11-1.8.12.ebuild
new file mode 100644
index 000000000000..ab1b66de4aa5
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.8.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# HACK: libX11 produces .pc files that depend on xproto.pc. When libX11
+# is installed as a binpkg, DEPEND packages are not pulled in,
+# but to build source packages against libX11, xorg-proto is
+# needed. Until a "build-against-depend" option is available in
+# ebuilds, we RDEPEND on xproto. See bug #903707 and others.
+RDEPEND="
+ >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ x11-misc/compose-tables
+ x11-base/xorg-proto
+"
+DEPEND="${RDEPEND}
+ x11-libs/xtrans
+"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ --enable-ipv6
+ --without-fop
+ --with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+ CPP="$(tc-getPROG CPP cpp)"
+ )
+ xorg-3_src_configure
+}
+
+src_install() {
+ xorg-3_src_install
+ rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 051e8e5ae2cd..97d76ebdbd8f 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,5 +1,3 @@
-DIST libXau-1.0.11.tar.xz 274108 BLAKE2B ffd037d6a5bd8bbf10d15747469c5277b3061b87793d8acf095f60aa121bdc0831da9d3e6c369846fd40d2ba03ef209e1e8febff64736d4ececd135a8fabb0a3 SHA512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd
DIST libXau-1.0.12.tar.xz 282624 BLAKE2B 739c1ed5cc86eaf6116bb324808e442ee485fb81bc882f873d924302494e93c3eae1a2ad3f92e115faf72e647578e7b9501c73ac18db1839edc2fb69a143a834 SHA512 4bbe8796f4a14340499d5f75046955905531ea2948944dfc3d6069f8b86c1710042bfc7918d459320557883e6631359d48e6173c69c62ff572314e864ff97c5e
-EBUILD libXau-1.0.11.ebuild 385 BLAKE2B a7888f1b7c388fdb0ca529d74c30f5c6692d34e7572b38c1304c45c209e498239838b55ec6c5e7d9b3b01559b0544815d5443887e22d57641db431c544c4eed0 SHA512 c855e78e7d5506cbc1c89e3eb0da65e7953ca5d6abe572742fb3c19371677a8b1fa35ff4727aee4e663b3a5fe0854fbafb44045d8190bd19d33ec0d63cca9e17
EBUILD libXau-1.0.12.ebuild 385 BLAKE2B a0fc8bbbd59bac46d7384361c4c6a72dbf7a445f8e05c3efc997a270cc9bd33dba0b4fa4c6c430a323fb80b148c7aaa03efe376ade398cd02f804ea53a3c2afd SHA512 2b0d8c66d630df362f8e6588a0d8ae7f584516f8fd2326fba28bce066e546dee7978efbf068d763bff937e1570d543591b335ae187087c398697139a2a113cb6
MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/libXau-1.0.11.ebuild b/x11-libs/libXau/libXau-1.0.11.ebuild
deleted file mode 100644
index 11a6e56cc865..000000000000
--- a/x11-libs/libXau/libXau-1.0.11.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X authorization library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index ace83324a787..cccb358e0b19 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,3 @@
-DIST libXcursor-1.2.2.tar.xz 289536 BLAKE2B 1619f71a514586bab7651aa47702a06a3b6e8d9c60b27c7eabe39b49dff9e83a050b88e171fdde4735ad4c62b1be4be10c84af35bb3e78dedccd9cd85fe3680c SHA512 6550ce1e69b35ef3356f25e31aa2779503d9cea780eff307cb646364993dfaa971304085d32677e68996bd3b8e067436c8fc89aeb4db07a12ce5bc93b735b5b0
DIST libXcursor-1.2.3.tar.xz 292764 BLAKE2B 46e95522d2ff45e5d2b3bfe4570de54ab9189e05956831996dee688cb306962ae5b5b37bfa49bffc8e9d0cf23b6ee501f65b24094b815c46f50baf2de7ea42ef SHA512 069a1eb27a0ee1b29b251bb6c2d0688543a791d6862fad643279e86736e1c12ca6fc02b85b8611c225a9735dc00efab84672d42b547baa97304362f0c5ae0b5a
-EBUILD libXcursor-1.2.2.ebuild 881 BLAKE2B fa077f580efc2781d90db90795ca597ff5f3ff2b8adf771075342bf67a4dc586188249b78c24cac917fc07c7653e18692a613dceef664e1f6f857e480a15a13a SHA512 a2e5d1c2c04c0f0af2a8938ac8833d1dd0c84fb0332994d624d702d9d5257b7377f9d2730f3dc55ae04d3b59acb113e4de9100808a9034e4189b8ac0ae323e30
EBUILD libXcursor-1.2.3.ebuild 881 BLAKE2B 31260370c8360597263782fcf69a71f6bac2eb3910455b324b6755d254ef6d5ed38e4b771a5788212f9112989cb69f2bbc861a6802b9e8caad537a65ce06b8da SHA512 8669470170bf13d1483e50cb6c2fb923e49d51c71deee56b8dff3449aaee3d067762d48ca74bf773525ccc24b626f750ecc3c70ac155f4dbcec1cb986128020c
MISC metadata.xml 341 BLAKE2B c8efd915b38a2d39c542bcbab6fc55b5d6e9859e3c81064f666bacc342f3eee63c2cc1e4f9e6ce095d28242c2e7d04021eb0c34b3088da601fa9c8c78ad28bff SHA512 e11bbb32b278b773e6a393a574c80ab35b84e8eddb542a85df8c288005476de58c326605de76ba7a37504100a20a71ef1bbd61f3402af3f79a81a28d60ac4d90
diff --git a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild
deleted file mode 100644
index 49637dfdb577..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xcursor library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11
- --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 5eac995d73c6..aa2f19175daa 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,5 +1,3 @@
-DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de
DIST libXrender-0.9.12.tar.xz 310432 BLAKE2B 703f32aabc074097796ecf97933fd9eb74aca4794496ae5d62fac3cef8646d41fffa8904ac3e76735473f918fa65e9c3da16e54ac512c45f2b00592e8e46dff1 SHA512 3d24a6877b500608e3e2a393532a99d4fd54fc343375d8fb51dfbb1b50cedf002c7722f771cf7776f93cb6e0421ca5966ce45435cb402d5f12a398f9ea743474
-EBUILD libXrender-0.9.11.ebuild 432 BLAKE2B 0c5ba38f9c2a63bc504bcd9aa8a073bfc80e15ea4b26d21de647ca3f841efe360ef375eb942a32097fde58b364dc2ce1cdb9c91c0a43496600e2e27c44436b20 SHA512 c4d272a3f37ce0117d0c7bed7f54debfec96b747dcfcb98f47c38215c2ed631816fe78e79e3085ee5f7b7b46d2694c4eb3c3e1cb3217c7a2c6c51ad8d8835736
EBUILD libXrender-0.9.12.ebuild 432 BLAKE2B 0b6cf1888f17126adc3f423622ef08eafb1246015b7e8ff4fe883cc63190aad1f692b8fe0000616396df3629ca270d9a7ab238811846769ec48d974cdc64e4b1 SHA512 5b60a66ee2e25e3fbf7b162501e4fe46c616115d7a531d55128a341a903ac089728d9a26b36f41211a57dda7d223f2df819a93ba1ce3296e28e366f68878225e
MISC metadata.xml 341 BLAKE2B 02c79694315c5ca33c90a8854cbf506addc7b69a68fe066f99a45c3fbe7764ebc69c03808215e056c2bd0f7b0261ec173d02a623e8c91c3a090b9ae77a1c83a8 SHA512 158a1a560ef016f8fd5c85a6dc65fae5ce9e960f65be43913a58a4218b2f24ef4cd925a490140f8463b206fb50d5c18243c9dc0ea56b0639f5ad9e5fbc0cb31c
diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild
deleted file mode 100644
index 4e4fcbab1b40..000000000000
--- a/x11-libs/libXrender/libXrender-0.9.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xrender library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index b9480c003726..0dbd2e172ba2 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,7 +1,4 @@
AUX libXt-1.3.1-ppc.patch 830 BLAKE2B 53cbc1049100fc6c7fb889efb7362f560199330fa4bca68db4331b23bd026aa68cca04308a9917c589334c9240422996a22f5a868d295a0fc2678f9cb9100f16 SHA512 9d9b4ac01e630e4c70295b31c8708d7321888ec1bf16e63f49f0fbda2d6edb61637663c1caf4eb0b71dce7cbcde41dd0a2520da36e44cbe65cc1cecd510fa235
-DIST libXt-1.3.0.tar.xz 688084 BLAKE2B e8ac62bee544521471f25d3138b88d8d740bf8701aa7b6c1badcb9f725659c2648f3fd31813e0a05f1091514323bcea0788319cd36dfa945213f83cae87afb7c SHA512 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118
DIST libXt-1.3.1.tar.xz 691200 BLAKE2B d3ce6475a1d5c87fac635d6b1d644679900b4bec1c3691fb3700bb9fec5009157f0920a567e2715e00792ea292681beb41f6b8950f34bd063e6d60d126cbd034 SHA512 c220292f60b0f53134cf9364831a32bbaa9fa6bbb3a7143e917920957b7a48c616e946042747089f29ea9d8a18ecd64de620bcaf56d82462e7107de906f5db38
-EBUILD libXt-1.3.0.ebuild 812 BLAKE2B a11a6f99be2d939badf9eb9c9affaf082cd3f4f25fd692b656a660fe52c54bbf1bb19bea56b46fabb1149d90ad2161452011da494b05152437db56040ddb6a31 SHA512 f080dd8843af6569cfcf3aef9f4af008b42f232c2f40bc5e354f037179057ba598a5b67d5a7564df25be20e2b66d93849a6f3e2e8bfd1f9080fe5d9e191a519d
-EBUILD libXt-1.3.1-r1.ebuild 863 BLAKE2B 2034c92d71b0885af921e88f719c4a2db6b3f9092c4a7dea207c7a5da2da01753e051c1e3e9842ea2e93d0a7cc2a0f0caf754d8cfdb8f7bffb11f5b16967f799 SHA512 e8c4ee510b66c570cc06986bae25a47976fc30cdf93b25afec1df819516ce9a9dcfb66061435e9020537f6fa2b2377a4983b7ce28a4197aa754d77b21e3afe98
-EBUILD libXt-1.3.1.ebuild 812 BLAKE2B c3c16bb2964bc9582bc5fe08933c27ef9e7009a3b1d00e4c1d75fad4b96b891d8eaa636950ace30c4cff30e7613ec6dd479348404bbb598e4c590483813d982c SHA512 9877cb4fee53b8a08ad0876a55e3bc7a94e77069af788468d793fe0e746c76b5dcdb25938957b2bb0039c7c3dc8259625e4e697f3830d18829fdc378af4a3065
+EBUILD libXt-1.3.1-r1.ebuild 855 BLAKE2B 8be83aa3d105323a8b8995c94a327fbbb30d684d09edef8b57c77953e492ad16e4175bb7ce66e48b5f55c43271a3b7490f7f7221e7b2a73dec3fd0513db1b0f1 SHA512 b245263ab0785041d4823ef2ac1fbff6e3b8c0716201c417493360e3c6c2ea270a716de544f2afa84e9654345fc6176ded1f5c12250398c816decec030c7e9c7
MISC metadata.xml 336 BLAKE2B f3ceaf37a1b9096462f9c82a317f29ef6d144aff5051be6a92235ebb2155fd7f01efa71466c59c2de4fdda58f84b2c3d790a15010fb16c6836e37fa6f2485170 SHA512 bca56314490246cde70c6b3104a7458cb72d9995d7a833817a91add87ce89dabe08b542de9d80f493ad849a73aacc3b8556acda29fe683eaa6d8c34882bcd054
diff --git a/x11-libs/libXt/libXt-1.3.0.ebuild b/x11-libs/libXt/libXt-1.3.0.ebuild
deleted file mode 100644
index 2609b04707b4..000000000000
--- a/x11-libs/libXt/libXt-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_with doc xmlto)
- $(use_enable doc specs)
- $(use_enable test unit-tests)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXt/libXt-1.3.1-r1.ebuild b/x11-libs/libXt/libXt-1.3.1-r1.ebuild
index f714c7614f95..cd8cb92de0dc 100644
--- a/x11-libs/libXt/libXt-1.3.1-r1.ebuild
+++ b/x11-libs/libXt/libXt-1.3.1-r1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-3
DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libXt/libXt-1.3.1.ebuild b/x11-libs/libXt/libXt-1.3.1.ebuild
deleted file mode 100644
index 15d5578aa0e9..000000000000
--- a/x11-libs/libXt/libXt-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_with doc xmlto)
- $(use_enable doc specs)
- $(use_enable test unit-tests)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 3583b62f3133..3fcac279cb5a 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,5 +1,3 @@
-DIST libXv-1.0.12.tar.xz 276020 BLAKE2B 567e824b77dd05a9e48f0ff0a4591d7088ee5b681b8822cda6a89c85b14a7471603cc5c80138d0734d7adaf9746610d443013492d10aa2a9efe4749e15e0388c SHA512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e
DIST libXv-1.0.13.tar.xz 281460 BLAKE2B a906908b95c47b8f5309ef7e3c800d560aaf4121908b351c66880977b1ee26302de2b8004692be25ffdca3d26a179034f9931a120194933aaf85ccc8f6bc91f7 SHA512 80d7a11e6415fbe0fc50c3c2a1abf8f0f2ec38446c9c8d88ff48875cd94b8949cb1028f2ab37476c4b25cbd7eac34dde9132dd998c4e04ea576b95ae411ba946
-EBUILD libXv-1.0.12.ebuild 485 BLAKE2B 3855b1e641b2e7eeed3cd58d4c62c25bffe5a2515f930ff73882cfc36075f1dc0ed20139b6e142fa61163a944cb1bb8fdad8b08a8b7a5cd43bbffa62610b2dc5 SHA512 f37ceae95421b8a78af7898018db49cb1f15512f49315f60fb1c7b4b989f03b2c7ff32a103391300e916917e2ae9bd4ef3148ef842575e9c0fbac292343e36fe
EBUILD libXv-1.0.13.ebuild 485 BLAKE2B dad92d779268ef1ff91319b4dbc90669dc9b671ccc388a6e6984ea90d1dcc26815ec8adf8a6c8828346a79469cb6fe4f0cf01e04f4869af6fffa7953ba57f07f SHA512 41eee8bbc08857a815cd750fee90af1ef7731afca530f9b9cc6ffde54a7680bbf495de8e1577dc42dfb8717b2e926834aa4c878c881cd915bee195cce73d2964
MISC metadata.xml 336 BLAKE2B df53f0c032a8ae8449fcb3a321b35be1981e1044461aa6356d1e47126ba671cf398614e88525d9fd9be633513556636f6813948e9bec593f2997bf48c47e2928 SHA512 9c32d9805677aa96736b66019dbd73055de44e2aa7581d123884b0a691b5cdcb3dbd1a8efd5d06e82ce7a987bca93f2127dfaa12cbde48d3e9162a7b7b9f599b
diff --git a/x11-libs/libXv/libXv-1.0.12.ebuild b/x11-libs/libXv/libXv-1.0.12.ebuild
deleted file mode 100644
index 2a12b2cc2fae..000000000000
--- a/x11-libs/libXv/libXv-1.0.12.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index a19220046367..810bff65e108 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6
DIST libXxf86vm-1.1.6.tar.xz 271712 BLAKE2B f5d996ad757c51c6d4bb206b8e595b474a79a0569cedc2c6b7cfc4adf4a5c1b4f22cde82e64a74bf468107bbebc2bae69d0e2c5afc7f2512725f482706a64e7e SHA512 7fb3ac4302eea43b70d5106f6c7a113e28e2807da22d2bb7f040e0c4afd322cad4b7f258a5bd6da3940b6b6b39065e1acb218a6dc0ba06b9dd86ea3849231266
-EBUILD libXxf86vm-1.1.5.ebuild 480 BLAKE2B 266b1020e6422edc1ca2e0e0c2fdc013c853d32954b154a7965c98b4822c88ab31f2aaf0953bb1be688784aa7cd25b222ba80ffdbd09c0fb318d228cf33aad5c SHA512 d220cd374c57061ecd98ee89fb2eaf880487efad9eff75b6e9b343f9374085d185bb870b7879a7888e6e642a113b78edfd876587d14e462467221a757b79f5da
EBUILD libXxf86vm-1.1.6.ebuild 480 BLAKE2B 92c6ae769b6b2ea11a6c99aab92a5073141efa4b84d916fe16450005ef683d35dbc98ca7342ee5c2495b372f56771de61568d9364919ac206723e0faae8d4767 SHA512 1f84c99d16b9f4b46c2e4bed31578fe38c62a61bb4771362c2b7a82620119552bad04b847d0c03a4b75e1a2375a8794611292c3714f1439aa9503a6303f7c2e4
MISC metadata.xml 341 BLAKE2B 0fde03018f6bd9fe5ab8a01f13387fce7e15707acbb3bc7fec3c9f444f0b374a4b388f786f5b0b1bf8cc84a5cbbd4655a4980a716a7d47db7ee9bf3347e9898a SHA512 34043e9c37357b1a6a1ac66f2c159e3393ed6c4ac0e3ffabf5ccbe48c85d7ee62e98c7d6a022685bf6b2f30a8886e386f402f4fbbdafca7343c828ca316bdc12
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
deleted file mode 100644
index e983409be891..000000000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~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}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a8380ebdb846..687707ab1e4c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.123.tar.xz 481112 BLAKE2B 5a621682ef32bb9b9b69b153a36db4b85df54595ade9910091ff62a477ea30fc9e7f22ab5d9b8c8a5f9f1cf428cb400b5e62f3cf811227666de718ddd8cdcc34 SHA512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d
DIST libdrm-2.4.124.tar.xz 481244 BLAKE2B b463dfb78168c9c94d7dd7e241a233f6500bc6ef00487daf81b936975a3d4f056cc83a764aee6de7200f5804e3aa05c0b2d3fb7e10ada5e1bc414d9a8f120f2c SHA512 0408c3ae5780c57d19321a9a7b046d656e252b2f48e520b2beb18f83495bea39c445deb9a9a6795b46194051c2ea4da476e08c63972daf841064099df6dff365
-EBUILD libdrm-2.4.123-r1.ebuild 2514 BLAKE2B 42af888eb1961e291182c6f7ebca9b185d2e639740614cf3059232587fae949993ec7fb2993947f0cff897381d84ffac2d1a5f8b329fefb51dc461b5e604ca03 SHA512 861f31281141dd5fef451c927a28f72ac0501da2008c281e20de8abe9172590f62f50a20111c9ff661f0cd99639547efb22b3a555fc918f40d1b047aa7d35e74
EBUILD libdrm-2.4.124.ebuild 2514 BLAKE2B 825c88a2f8eb062ee5e8a1aaeb8b39394583584fb34ac01e16806d3b8b9f7c6a6b84c8e0a216a127d7fb5270bf7db8c0fb1369f48129baf0a550d5a897c88f1d SHA512 6fbc8f6e6ceadb154a86b8fc7c85e27c9d6d6d12c3a9f5991e14a49af8c6e803a7e7c766d10aca27f25933d354079b649342037ece0b784e3ab4d7b6cf32196d
EBUILD libdrm-9999.ebuild 2522 BLAKE2B 2c7a2fc8f98e209274b956d1395a374ce6bef8f2525c19858393448f02dd3243cf867ed506fb0dfc9d6141accb5b8ed4ce767ef6ffc1f947bcadd049c5eda66d SHA512 fdff83825843fdd519520f1bc57873599050d2f05f5dc6c1380cfacb8b12da94c5a44813328d5a152f97040b95a54a83184a748ec67a733e045492dbb64ca121
MISC metadata.xml 410 BLAKE2B 86cda23d38e7b6f3581545fcd036c4d6233380e3a61b3ad8a94b8fef4eb8ae3f3a9bd4680b0cac219c0decd4c2df58bf731fce668787b0b3bf7d88f054110a8d SHA512 5c10acae8f229f49f789c0447988a4a48cb2f7de996b9d0a68fe67c0a217d405bc4face3be503562210da7f480a17aebd64d6ae9b38d8d2ff2dc031c41b438d5
diff --git a/x11-libs/libdrm/libdrm-2.4.123-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.123-r1.ebuild
deleted file mode 100644
index f2fe1b0a540a..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.123-r1.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..13} )
-
-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 ~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} doc 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}
- doc? ( $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
- use doc || return 0
- 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)
- $(meson_native_use_feature doc man-pages)
- )
-
- 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/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 6357a27e2c1c..f1fe705a4599 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,5 +1,5 @@
DIST libfm-qt-2.0.2.tar.xz 412452 BLAKE2B ce63a75722769fcef4766461bea66f26579c0a37a73f4ce8b0ee976a53beea5bdf431c515d5f0195c02ddf46407802027d05709b8baf2bf1349578a38a33e8e8 SHA512 479a7de05096b0c7763676e8eef5fa83ec06b4a5bc7bde697a265b2ba3ec79f6733169bf4b4aeef807df44660790b3d68f873c3a428f45aa38820bd861ca881b
DIST libfm-qt-2.1.0.tar.xz 418828 BLAKE2B 7055d4735b8f07ebf55a279404a531eabfb116f17c540aaf349874acef1c573a2d06fbfc084b04ca396c46a79122d9d326876bc694aa62c9a2ec95f51be75b8b SHA512 8e38648d882f88a34f0e1a17e6f2ba9e8c11cfce3a6afdc77e525f5078ede240b032df7fd76c50b42d1f81db46be0dd5af949879dcf70c2fd7081e9e776e18bc
EBUILD libfm-qt-2.0.2-r1.ebuild 910 BLAKE2B bce403c9534065821337dd2b4f6ac170e8c71166879b82d76ba6b0f9ceb78aa56bd01b4f07c1c7f5f792d3570f6a80ea3edee3fec96bc6c85e10aac2624c7e11 SHA512 5529a0ae577e9db001da393d9a11e9ac195a0e24170501091389e9e0060aaf008de50d8ebe319c70475ef0724dd5813b254f5cec6e3e1b4f3b1f7c372c14caa4
-EBUILD libfm-qt-2.1.0.ebuild 807 BLAKE2B cc23cbeb82aaa31aef1e1c4f5870c9faf015d0982404c3a8d51ac5940d3d75aad0dcdb358e9fbb76fc82c20feb9c47d9f54e9c8b57210c73da14551e68d763bd SHA512 bbda65b5de9a0ed33e790699a513acd5dc338a628b3929e1600d0c3895dbc417ced58e5e09054c9e646eeed62bf727323d8310ac4afd5fe3bb1fab0e830d2b07
+EBUILD libfm-qt-2.1.0.ebuild 806 BLAKE2B 820e635754dcb4aab9ec8ecff183f627c1142b800706b9bc20204158587eb2e8755fc557d2a575495027d41fba3e9f20062c8f9f51b3681a2d6096808da0266c SHA512 ced7b69685084f78a7e65a106a6698a5064658f266aaee21b70aeb9e39be086ffca2a75c8dd96ae829ce957bb09d169ac29e720792b59670ef6c23a392dbb965
MISC metadata.xml 315 BLAKE2B 1ca0894e1b787a755d024f95c4b09659b300f957f5cf69958bb3801e464eb84385303bbde99be3b491fc85e4202656dfefd40e5aa97ba47533307bfe07d40a0a SHA512 f9df6f22d74db03f845ad296b50e6d53e204867b2f00cbb04448c33f5ed3d22af6de3f9c58238f0e657aa4b963e467db74864d94266e5fa6923f2cb9c330e56c
diff --git a/x11-libs/libfm-qt/libfm-qt-2.1.0.ebuild b/x11-libs/libfm-qt/libfm-qt-2.1.0.ebuild
index 9fb8711b76df..e281eb472cd6 100644
--- a/x11-libs/libfm-qt/libfm-qt-2.1.0.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-2.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
fi
LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 3de5bc119a8e..375723d6b112 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,3 +1,5 @@
DIST libnotify-0.8.3.tar.xz 106008 BLAKE2B 05852c866dc91d42cf01804333605ecb546f7d779b143fabc341752263c8cacea9acda40bb60af90dbc84ab8327ba99966e09924ccc337f7a97909b95d39a874 SHA512 e55073fdf418a4c04375825221edc92ab6a01201b83db2a1f1530f8f91f7da9da32327452b0785251790553517dcc717cfe623142450691b7dd247ec9164cffb
+DIST libnotify-0.8.4.tar.xz 107396 BLAKE2B 463ac3395ec79cfeb1a7e4584905bb36a708e30700a6acaf28413f45bf2b86fb0df3e8beeacb6f8a01d49ab6940382ef58d4bae62a2d9769dd5ee2f047be2429 SHA512 b13163a3b787133700931077591debc9cb89ac917f8fcf46bfb58bcf7eae348601b1e03299786d9af368139278b128424919358a8e7d208621f8b350fd063b0a
EBUILD libnotify-0.8.3.ebuild 1663 BLAKE2B 4c160976867f2ec486c2c871b4400287ed1bbbf4f7670c47952ca9ad8a80c2b78c24a8cb3dc68ee41853e311c7d0133c880729e5c3783160599007b62b26e569 SHA512 c35f9e353b9531f242a614164a2bf3409298f6ec660654e66dab452df4f8183e6d53bdf554f4f35a2048dd7c89ee4c9e1ec175f77dced9c4182f25c61ab88bcb
+EBUILD libnotify-0.8.4.ebuild 1670 BLAKE2B 09162ca424a916fde0204584596ba6097d9f2defd32d232817e79d00f358d582e1e1ea592f3359d03b3be50dbecda273e16a25eb4c9642c1a465c20e85852247 SHA512 c6f90b2119cfb6bf743f4c41204a2cbf5f23320378fa7f2401d4a66054954978bbbe5f1634387740c3abe48d5a4486747a6dea98bce46f49b038f55425a3c327
MISC metadata.xml 487 BLAKE2B 9ca610c8e5775a9daf61254bdf6364bf8e2df0646c48c78e1178b5232faa1711c7a2cc85943dc8078b92c59b3d4d2a65525d4adc60d2fc323048c264b9495996 SHA512 7f1d6337756480c08fb487ec9115fe2ed7b7cae248fdb751fb3cb49c301807deb02b879e3ec8c275bef87d33c8eb853d6f9a16d72e6fcafb47446d8f634b2fa9
diff --git a/x11-libs/libnotify/libnotify-0.8.4.ebuild b/x11-libs/libnotify/libnotify-0.8.4.ebuild
new file mode 100644
index 000000000000..e05a80fe160d
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.8.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-libs/gobject-introspection-common-1.32
+ dev-util/glib-utils
+ virtual/pkgconfig
+ app-text/docbook-xsl-ns-stylesheets
+ dev-libs/libxslt
+ gtk-doc? (
+ dev-util/gi-docgen
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+IDEPEND="app-eselect/eselect-notify-send"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use test tests)
+ $(meson_native_use_feature introspection)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ -Ddocbook_docs=disabled
+ )
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
+
+ einstalldocs
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+ mv "${ED}"/usr/share/{doc,gtk-doc}/libnotify-0 || die
+ fi
+}
+
+pkg_postinst() {
+ eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+ eselect notify-send update ifunset
+}
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index d5e66b7f7029..b99714efec9e 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1,6 +1,4 @@
-DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0
DIST libxcvt-0.1.3.tar.xz 9680 BLAKE2B ae104743153077454ba8923d7b8bbe77d834e4795fd735de9e42617c3e49fd63052ad37214e7ab45e3f5884cd6038b60c0ff7c52f8a7892e0dea4630aaf0abad SHA512 2fecc784375e69b6e8e46608618a5f5a8ad20ecd5229fd093883fe401dd6ea231d8b77c6753756fff01f3040bef2db60a042d40fc349769ef5348e5cd9ed1f28
-EBUILD libxcvt-0.1.2.ebuild 416 BLAKE2B 21780fa43262afbcba8da1d3df3fde9ced942da50b89151122550c5364d395cf4058940f723bdecca30881613b81676ee23111ec3e6e625e7d03eef8b1ceadfe SHA512 4c598701c53edaf3ab5f8b45acde0e77d4ebc0e8e7cf1e53691efbdc023b8f869cc9fa27b6a876ba4b2c07907163a88d42a19196ba38fe24d0dd21808f3acc63
EBUILD libxcvt-0.1.3.ebuild 371 BLAKE2B 7b0d64eefca6bc841ad2a125bdb7f0ea88121040e9bd1c61a2c4702a62760e15d1399d884c349f82e11073461612b07441210a80ce83abc0fa664e951c589507 SHA512 aef7d58d4a56c05dd3cd25143ee4afc6b8f389321886b1dd8baced6aa620734d3b429a2cd755923d4ac149f9f81b46031d636c9d29252b1c4056037fdb72d22f
EBUILD libxcvt-9999.ebuild 379 BLAKE2B fcbce6309d0364190e47438490ea768225d28d947d91805b2a217e0b26eab46f39f92c7a327fa8d52ce922ae209d5ced1d833122751cf5156a523d87846a3ed4 SHA512 766f3cef89744a83d61c16cebcc0f07eb5ad3427f14fe843a5365fe6f56d843cce5aa42d5b2643f1c623857223f42463d77b7dd555f3caa41f2a9c5dc79619ed
MISC metadata.xml 338 BLAKE2B a2ddb5adc6ae17e449baf87adb1731b6eba290736a5e9b0bdbc2fc46da8fc81fe1248c9f28d16ba1798ba215d6140c4f94a99defded313ff5cf977d2b80d6707 SHA512 2d6191c894e6466f9f37b0c658e914faaaa5c1d4899ef23911fc78417cae347c6292693df307b6bc1ac546845d2246263acd0e6d2638e36598a7f6325a30e771
diff --git a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
deleted file mode 100644
index 5fd59096c18e..000000000000
--- a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3 meson
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="X.Org xcvt library and cvt program"
-
-RDEPEND="!<x11-base/xorg-server-1.20.11-r3"
-
-# Override xorg-3's src_prepare
-src_prepare() {
- default
-}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 5f1697957b1b..8b8907045350 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,4 +1,6 @@
AUX libxkbcommon-1.7.0-symbol-ver.patch 3905 BLAKE2B 4dd577bf14806a854009dd6065841be6c4ccb900336aab79b4d41e164e9e85ac00c513a644f30a1aaf60c1de84780e8ffd356c3325b20e2ec5890bbfa0145999 SHA512 7acb5488683bd0d27b7decafbd9231b30ebf5dc6e089a48873dffac6be16290fc7ea6409f0539eac1cc35a17df88c0fde3cb91fcf7d337366ab785ef1f6013dd
DIST libxkbcommon-1.7.0.tar.xz 534312 BLAKE2B b85cd8a78fce3c624e0c64c26a37b6d99bb8b8f3de489c6909826f53bdb6d33842f7ffcf955f6a9a8eb57cad53fc9756bd15d05aeb813b0f92985827243949a8 SHA512 4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5
+DIST libxkbcommon-1.8.0.tar.gz 995648 BLAKE2B 8edd795aff35c881bfad7905b4dc73d4a99fde23afad1b8874cb599490b5245e6b1d83a97dfd7a2031c1d232618c9a8ecfd586990b4a46df1eb87944f20660c1 SHA512 2e9a9c02bcc515c43db38266ad4b23d3530be3de28d05e086d3c12155cf1c569609a55fa4ea4ca9b0adbd8d2a553724bfa78f63481487bfee6379b3664f3aed0
EBUILD libxkbcommon-1.7.0-r1.ebuild 1858 BLAKE2B 57742992bbf495c4aa210f861d432dd0bb2354974757315db8657273493d74918034a734daea576718f66ffdc27616e6976904604b1ba5b8b9e2eaaf6819ab3e SHA512 41b958ab457caa13e4fea060cac0e9fe8c6fbffe6197af6b1a1c7746dc403dd90bdf58a6c53d7255986fa96ceae0bbf5e1683679e4ee9bdec0f685f3dd2a03ab
+EBUILD libxkbcommon-1.8.0.ebuild 1902 BLAKE2B f482dce10215e5a8a5d7493b4ef8c2a186af4654a23750e85450d4b4a7507e947260f2f963980376681329068e9127c788873dfe43b1a7afbcb85d61b3dab64a SHA512 ad20aa84596c1b453ea77903d1e9bdd3efc0ece99816595bae49d2826c278fc7692f02df930e6f37b0b05fba67c9ecbb02321f81c3a5bebbb7c0c0f8c09c675f
MISC metadata.xml 470 BLAKE2B 4edc4923d3888c12474fb659cf1fb1177c600fba9e8fd34fd6be284c979313bb3282d0fa9084c0aee29d9413e68947dd0ee2d241af4e78b2eb06887d2d684f6b SHA512 e19a6e154a79578d5641dfdbef8e963794b14ef0b0f63450dba2d24044e83b517991a72d81598420567978dcecb9d4e4f0eb9e4cf63e0b562d3e41aa80b39a87
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.8.0.ebuild
new file mode 100644
index 000000000000..4c16b4dcbd79
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+ SRC_URI="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/libxkbcommon-xkbcommon-${PV}"
+fi
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
+
+DESCRIPTION="Keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="doc static-libs test tools wayland X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-alternatives/yacc
+ doc? ( app-text/doxygen[dot] )
+ test? ( ${PYTHON_DEPS} )
+ tools? ( wayland? ( dev-util/wayland-scanner ) )
+"
+RDEPEND="
+ X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP}] )
+ tools? ( wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) )
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ x11-misc/compose-tables
+ x11-misc/xkeyboard-config
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ tools? ( wayland? ( >=dev-libs/wayland-protocols-1.12 ) )
+"
+
+pkg_setup() {
+ if use test; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddefault_library="$(usex static-libs both shared)"
+ -Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+ -Dbash-completion-path="$(get_bashcompdir)"
+ $(meson_native_use_bool tools enable-tools)
+ $(meson_use X enable-x11)
+ $(meson_native_use_bool doc enable-docs)
+ $(meson_use wayland enable-wayland)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ virtx meson_src_test
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ mv "${ED}"/usr/share/doc/{${PN},${P}} || die
+ fi
+}
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index f2903de59daa..ee8b0300a235 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,5 +1,3 @@
-DIST libxshmfence-1.3.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c
DIST libxshmfence-1.3.3.tar.xz 264860 BLAKE2B 3c06005fdb3419b0baf2cdb1e8ac0099ce7500c87b6ed6fb641d668eb51822d4bb8cd6a79492655fef4e0472a3d0c67a9cb0e12431d19fab779b04da9816b9e1 SHA512 2261b840ea621cf4ce31961ec9df17aa2e253b268afe289dfb97c240aee27b9f443fe36de5de52a2e1210b69092efde21871e20556bac9b4f1d8a3ead1b4c498
-EBUILD libxshmfence-1.3.2.ebuild 355 BLAKE2B 1da828b2dbc30ced5b9b72018536058e6984107b0dedb8b4113c263ddeb83ee3c9541747a911bc30197886ae4e94e25ce02ebd2adc40d6d37621d1d0d5c99844 SHA512 ce7b02ba19f6990e4781895df548ac0f75fa6bb223fe4577a5a3b52e0fbed79c2340f306fb53d155235c67c57cf12bf681012fabc7867570213d37f8d258bde4
EBUILD libxshmfence-1.3.3.ebuild 355 BLAKE2B c6023a62dac1f79c90c8c084661e0782850cbebd4b1e9da8036bda4d7cd90ac3d86c93ec1cbb608eeeb30059466926280412f14fd11f3fb2f5822b478a30415f SHA512 4cd4090bf675a2468c59064cdb514d4b4ace44ac4752bd4caabff98e167608b0a759313c1d20311739f9eff31144f741e3a9f74415a42e9eab91898bcec9d5af
MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild
deleted file mode 100644
index d28ca9b51e9f..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index fdf25bfbf3a8..2ee3d175b8eb 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,7 +1,5 @@
-DIST pango-1.52.1.tar.xz 1956856 BLAKE2B 0b7f58f3d74bd37df285f3fbf14d2d2d776fbcf773568d63f12f26976d2ff505c19616fcee11562933df2594762e9ca30fe96a1d02dcd174381b976d63c68ac1 SHA512 7cddbd61afc3c98ffd09ea08c5d7613e454b6705f72304cb9b3578865b6bda70ca20f98605dea73f2cbca5e264217c8d79e4539e9eb36b8775d5d2a4f769cf32
DIST pango-1.52.2.tar.xz 1963588 BLAKE2B 9367703addcc6805fc14f0c0184d9d1b4093b8947fea9d260c54eb6c86ce56a0d6cfe35c3d6340eaa5d96fb84f0a94c5979ae308bfa79f02e4ce25c4c093556e SHA512 6b3d762d133e7c900c6dfa85f43c950699930f6149cb3c90bf0e787f1b5a126a0b90220b90e649f84e4c244e44c46d4b575d5d7afeb305232c333712effc0981
DIST pango-1.54.0.tar.xz 1963180 BLAKE2B 92c389ab3f21631c245575e30804ffee6fef7b60bc6acdf08159aa325d878cf335203267720aec9143ea2a4e590578424cd64011f73da22e1b0beca85e85a276 SHA512 b08792a811e033b2dc9ae78278ea522fad1064de3a4d33460271eb0502613ee21d2c82349f8e7d8f59d59e0c020b7a3a8efa194572e16e2e78db422956fd97ea
-EBUILD pango-1.52.1.ebuild 2357 BLAKE2B a758e3c7b3a2cf3bec16070256cb85b97b69036bb177a02e2734bc9af4565742bef36a517887fcde068978702125bf0f6e9b173b2ecf6098ed9eebc95ac4f87e SHA512 8d1a87cb4fcb4252d1f97563247b5f51d6272f60269486217889a6760038a0ea4f3a475cba8d75c1d4512dc5267241eba8e1b952005ccff9d7bc341d09ca8ff5
-EBUILD pango-1.52.2.ebuild 2354 BLAKE2B 33b294276a617e8302dd2e08a7b98cbf8025164db369bbb602065dadb4c44969daa262a1a60d683a4181d80f29e0ebbe1441820e74f336e16a8eb5573e7d6086 SHA512 665bce9ea96384ac0940b0499838185da0c4fc896253906e0739b09bf76ed46cac832eb73e52b8e9929f82c7656f760d349288a9ed9c3bcc30050feff91f95b3
+EBUILD pango-1.52.2.ebuild 2353 BLAKE2B 8ea23c6d1473e213ddadb939374da1205cac99445ebe3eca942e63a972ed833f921fce464eb80abfd43b4643cfd5f3d94062b6ae6155312ed481aac9a5c8ea4f SHA512 1428c51f80669564d0456946899fca3ef98e420359ab53d4da1cf2c70225a5f6177efd5ff66c63e6ae19fea6c75b9eccbdd2a7e8b714e95342aff3ec939c7f01
EBUILD pango-1.54.0.ebuild 2528 BLAKE2B fbe144a5b03356ca89a5a67adcfec29c1184b3affba60162e442400ac7c5946643bfd4976e699582e8aa945a8451c39fb678391579046d161cdfaa6cd0a329a8 SHA512 bba262fb577b930e1ed498fa8b52fadd2bf744be80cf32501255efec9b40ab23e26c570f82edf2b8296ac4e06bffe227f17d1555b582b9a42d66641017b995e7
MISC metadata.xml 666 BLAKE2B 200a6b70830fd45740b113dca54bd391839367ef35e48cf7878de419e454e4a7efcad286835ccd78587104289a0d0c5e84dba9e36f5cbdba33e48c463c319681 SHA512 adf2dea970f8b3bd6dd1063a78b977067d20e55d0a96cc4193c2969f69702f8d247474ecb6a17ccd8c43d00f7ca0dd383704860c424a3af173eba56cbd7f66bf
diff --git a/x11-libs/pango/pango-1.52.1.ebuild b/x11-libs/pango/pango-1.52.1.ebuild
deleted file mode 100644
index 8eb02dcf2961..000000000000
--- a/x11-libs/pango/pango-1.52.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-IUSE="debug +introspection sysprof test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="
- dev-util/glib-utils
- sys-apps/help2man
- virtual/pkgconfig
- test? ( media-fonts/cantarell )
-"
-
-src_prepare() {
- default
- xdg_environment_reset
- gnome2_environment_reset
-}
-
-multilib_src_configure() {
- if use debug; then
- append-cflags -DPANGO_ENABLE_DEBUG
- else
- append-cflags -DG_DISABLE_CAST_CHECKS
- fi
-
- local emesonargs=(
- # Never use gi-docgen subproject
- --wrap-mode nofallback
-
- -Dgtk_doc=false # we ship pregenerated docs
- $(meson_native_use_feature introspection)
- -Dinstall-tests=false
- -Dfontconfig=enabled
- $(meson_feature sysprof)
- -Dlibthai=disabled
- -Dcairo=enabled
- $(meson_feature X xft)
- -Dfreetype=enabled
- )
- meson_src_configure
-}
-
-multilib_src_install_all() {
- insinto /usr/share/gtk-doc/html
- # This will install PangoXft API docs regardless of USE=-X, but this is intentional
- doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if has_version 'media-libs/freetype[-harfbuzz]' ; then
- ewarn "media-libs/freetype is installed without harfbuzz support. This may"
- ewarn "lead to minor font rendering problems, see bug 712374."
- fi
-}
diff --git a/x11-libs/pango/pango-1.52.2.ebuild b/x11-libs/pango/pango-1.52.2.ebuild
index f691c510af14..d92bdb38e489 100644
--- a/x11-libs/pango/pango-1.52.2.ebuild
+++ b/x11-libs/pango/pango-1.52.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="debug +introspection sysprof test X"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index cca1b9f64196..52b7d6ff1f6b 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,7 +1,4 @@
-AUX 0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch 3124 BLAKE2B fafcaf9646e07d74acad752af4dd1ece5abeadfb502a2d5b93600a6fa75e33c89d0d614dcfb17e20814bceff6f5339b7cb989cbce51a23dbfaf68a208fcaaed7 SHA512 2cae551cf90fe4fbc36b1ab3f7f682e2e7c18c593b9f2edf390e666ce03c8d32a298d280366bf1fd6da59f8350f85b907e253352989144fef8ff14a8cfa984aa
-DIST pixman-0.43.4.tar.xz 636900 BLAKE2B c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e SHA512 b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36
DIST pixman-0.44.2.tar.xz 650012 BLAKE2B 856aa35ae705de522d70250beee8acc872b54d2b5caa9cee6bc12ffde7c293b3db76f56c75858cc5ab1bc592fb1d4078485c2def2ae4bcd5a50b6dfc2eb477eb SHA512 b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4
-EBUILD pixman-0.43.4.ebuild 2238 BLAKE2B 2f594f023a924cd5b4e1089c45ddeeb6b41a7fb926753684c7aac21e1875f1943359f82397520700a893341d5a5d4956c5fb0a94b262a66f47c27d22ca89d143 SHA512 73d380de9fb36d1eef2fd040cdac5edcbe1cc056bf73d57426437932fbdd21667c25a9cff56d559be48ce9d81dec34bdd1716e7a81c2086352b6cb4309c93bf7
EBUILD pixman-0.44.2.ebuild 1810 BLAKE2B cca208bd8bb14a19f37271b7b6c7a4f90e7daa63687e763bd16cdd683d37d1e455808848bbde74296546e86fdef3cc0fd161c7072df8d6ec1a4adaee58fa495f SHA512 1d9ac989341b88432c75522d69cfcb0502f4b2a3a0d0bbc1b1775cabebc229476e42618597df9e8b58ebbfd191eb0523faee475d89ca6e4fec2057ec30237695
EBUILD pixman-9999.ebuild 1818 BLAKE2B b60e94340705445737bbd470e5a167b7e5d46bd28a39c55edde7a68c58b6839ccd1ea22673e671ec64e9237196315d5a32f6974d3373f6476d8ed48502daebdd SHA512 1c91d3f33486d31ea469c4989e369a3513dd1057566c845123dfaf8c10a3e4c35b28e25329982baf6747cf0f72116ae0bd5c6d606e8dbf14ba03b90851c65537
MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch b/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch
deleted file mode 100644
index c59ed7b3e81c..000000000000
--- a/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-https://bugs.gentoo.org/942441
-
-From 865e6ce00bb79a6b925ed4c2c436e1533e4472aa Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Fri, 12 Jul 2024 11:11:17 -0400
-Subject: [PATCH] pixman: Adjust arm assembly for binutils change
-
-A change in the latest version of binutils broke building pixman for arm.
-
-The binutils change:
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
-
-Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/96
----
- pixman/pixman-arm-simd-asm.S | 44 ++++++++++++++++++------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S
-index 34d38f1..3dfe723 100644
---- a/pixman/pixman-arm-simd-asm.S
-+++ b/pixman/pixman-arm-simd-asm.S
-@@ -820,13 +820,13 @@ generate_composite_function \
- .macro over_white_8888_8888_ca_1pixel_tail
- mvn TMP0, WK1
- teq WK1, WK1, asr #32
-- bne 01f
-- bcc 03f
-+ bne 1f
-+ bcc 3f
- mov WK3, WK1
-- b 02f
--01: over_white_8888_8888_ca_combine WK1, WK3
--02: pixst , 4, 3, DST
--03:
-+ b 2f
-+1: over_white_8888_8888_ca_combine WK1, WK3
-+2: pixst , 4, 3, DST
-+3:
- .endm
-
- .macro over_white_8888_8888_ca_2pixels_head
-@@ -837,21 +837,21 @@ generate_composite_function \
- pixld , 8, 3, DST
- mvn TMP0, WK1
- teq WK1, WK1, asr #32
-- bne 01f
-+ bne 1f
- movcs WK3, WK1
-- bcs 02f
-+ bcs 2f
- teq WK2, #0
-- beq 05f
-- b 02f
--01: over_white_8888_8888_ca_combine WK1, WK3
--02: mvn TMP0, WK2
-+ beq 5f
-+ b 2f
-+1: over_white_8888_8888_ca_combine WK1, WK3
-+2: mvn TMP0, WK2
- teq WK2, WK2, asr #32
-- bne 03f
-+ bne 3f
- movcs WK4, WK2
-- b 04f
--03: over_white_8888_8888_ca_combine WK2, WK4
--04: pixst , 8, 3, DST
--05:
-+ b 4f
-+3: over_white_8888_8888_ca_combine WK2, WK4
-+4: pixst , 8, 3, DST
-+5:
- .endm
-
- .macro over_white_8888_8888_ca_process_head cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
-@@ -1067,9 +1067,9 @@ generate_composite_function \
- .if \offset != 0
- ldrb ORIG_W, [SRC, #\offset]
- .endif
-- beq 01f
-+ beq 1f
- teq STRIDE_M, #0xFF
-- beq 02f
-+ beq 2f
- .endif
- uxtb16 SCRATCH, \d /* rb_dest */
- uxtb16 \d, \d, ror #8 /* ag_dest */
-@@ -1079,13 +1079,13 @@ generate_composite_function \
- uxtab16 \d, \d, \d, ror #8
- mov SCRATCH, SCRATCH, ror #8
- sel \d, SCRATCH, \d
-- b 02f
-+ b 2f
- .if \offset == 0
- 48: /* Last mov d,#0 of the set - used as part of shortcut for
- * source values all 0 */
- .endif
--01: mov \d, #0
--02:
-+1: mov \d, #0
-+2:
- .endm
-
- .macro in_reverse_8888_8888_tail numbytes, reg1, reg2, reg3, reg4
---
-2.45.2
-
diff --git a/x11-libs/pixman/pixman-0.43.4.ebuild b/x11-libs/pixman/pixman-0.43.4.ebuild
deleted file mode 100644
index f81d1c4ed4d0..000000000000
--- a/x11-libs/pixman/pixman-0.43.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-pixman-Adjust-arm-assembly-for-binutils-change.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-multilib_src_configure() {
- if ( use arm || use arm64 ) && tc-is-clang ; then
- # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
- append-cflags $(test-flags-CC -fno-integrated-as)
- fi
-
- local emesonargs=(
- $(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
- $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2)
- $(meson_feature cpu_flags_x86_mmxext mmx)
- $(meson_feature cpu_flags_x86_sse2 sse2)
- $(meson_feature cpu_flags_x86_ssse3 ssse3)
- $(meson_feature cpu_flags_ppc_altivec vmx)
- $(meson_feature loongson2f loongson-mmi)
- $(meson_feature test openmp) # only used in unit tests
- $(meson_feature test tests)
- -Ddefault_library=$(usex static-libs both shared)
- -Ddemos=disabled
- -Dgtk=disabled
- -Dlibpng=disabled
- )
-
- if [[ ${ABI} == arm64 ]]; then
- emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
- elif [[ ${ABI} == arm ]]; then
- emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
- fi
-
- meson_src_configure
-}
-
-multilib_src_test() {
- export OMP_NUM_THREADS=$(makeopts_jobs)
- meson_src_test -t 100
-}
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 9f06bae977ed..3171c8390bdf 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,6 @@
DIST qtermwidget-2.0.1.tar.xz 191548 BLAKE2B ec3155d8a92f606790c635c315df6809483b93d8976b24725288c030889a2010c88a7ac48f0dc8ed3011fbfd75e819dfd6213259c3d893b7bddc4927e14e6dfd SHA512 ba9bc9203428e54137ed1e5865bf9260e1d64bedda8e766a92fe16277179fdc83a95c5b6df42ba3ab82babb00543e50ec48faf26668f7af26716ac98ab6da62e
DIST qtermwidget-2.1.0.tar.xz 191604 BLAKE2B 67f9e6f170b6f1d2f4ff432e2706e8b3dbf3783ef9b62d1130dd07ca5a989cdf066ff7ba6d35a0e885ce108fa5c2c7d67470a0a511363462df82fc0aec44b648 SHA512 a3ab6c373f3438765f61f00efbafa3b8d17cc83defb9c5f4e552633e9a3b17e0eb399f3a18732c889c2db8b44e8e7a781c6f144e3a83b9a19f8b038ae4a87ddd
EBUILD qtermwidget-2.0.1.ebuild 625 BLAKE2B ff2d4ffcecd63832dfa46329243e955adfd496d05253f92c6025959845adeb6266fb0090bd90b031daa7be647946e18c927988ef55244636f3cda4b7ef13abf3 SHA512 52d3c717012309534b1e87a0b959b4099045acea7f403b4022139b614eb409710ca312e1364fe1dafcd3c98c161ce45fbe6a62eaaf8a284da55ca860f8d22138
-EBUILD qtermwidget-2.1.0.ebuild 626 BLAKE2B d4f37818e6261ebcafc3466d23aa687685709ad81366a4a3571ad13d0f1244c2358791b479f23f5c6b2c7696858eb28b6e6dfb04cde1a732b385680414f574b1 SHA512 c86046f6b0f33bd75909d9e31c457fecad26e478ae2c8bd0a4ab737a0a4f7298e39d1371e3863545dd49d3208476f4eb4d87899caffbc6a011442d332f27728c
+EBUILD qtermwidget-2.1.0.ebuild 625 BLAKE2B edd8430bd07a4b6831119ab436f329976718482b27f16d9bacec530af225e2352b4a35ee90ea463f0387ca6fd2c77b8132970bc4181ab6ddee45e4feaad488bb SHA512 2df3d21980a2a9c18283162122fcaca86f6ec4600f704bf7ded00c82f25760fd90efb60f34f044b0fbab3afa518e5495469eeb0706dc5364de05aa86ef223d2f
EBUILD qtermwidget-9999.ebuild 627 BLAKE2B 666da8629815e011564c9064987db6a02a0de4c3a225eef956e8729bc76057f3858cad5dca81052c52467c4ce59a26bfbfffbf75a83a6bfe83a71e793db7ffd4 SHA512 315c25d3d20ca1124368cd691eb6508b8bd16f4cb3094d2a41bae9aa0128b99944b2af2ba81aaa52d4690a1385ca8558519ffbf1012831ecdbff6ed9ac0d8b7f
MISC metadata.xml 592 BLAKE2B 0d2c8417ebd737779172fa9d4f20ac7ac43b2c0f0e8af1bc78a1c1cb03931c74786093e059c42c5da4990b894c46f9b74aa53f5fd7acf361aafcc42593518ff6 SHA512 af3edbac8d3e9973f931cd480f5ad19476dbcc05580b2586b69ee86828986c4e446464c501d217c9b0f74191b0d6e5ab190daf778bff7e43af87d1a64fb5ad52
diff --git a/x11-libs/qtermwidget/qtermwidget-2.1.0.ebuild b/x11-libs/qtermwidget/qtermwidget-2.1.0.ebuild
index d9768b543f89..946e0c5a36ef 100644
--- a/x11-libs/qtermwidget/qtermwidget-2.1.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-2.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
fi
LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index e625dd023672..61e1c9947826 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -3,4 +3,5 @@ DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee92098
DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
EBUILD qwt-5.2.3_p20210828.ebuild 1298 BLAKE2B 183f99cdfb374e1546bb34bf63e6106ca4a1997b6d65e1a52c19488c4d0149757fdb68212f448cac6764faccdda4dab6233d75a47f91f88c2366f8fa0a324512 SHA512 3cbfec2c03536099cdd0928b59ad61b3a8e7c2068ecb2a7ad7d3e2ed3f6156c104101db8fc58ce3f5ebc9889d6c133484f8f260cac5fc71d958bd4aed29f1143
EBUILD qwt-6.2.0-r3.ebuild 4237 BLAKE2B 348ac8b601cd7b359c87a1d5fd57fa6089e146be6dbdd10deeb4ccea66e21dab3609751f871f081c48e642d21835434613bc6fa465226de0e936b7c4e2907e30 SHA512 bd41493eba391fb40ef05a0c4aa12baaf179c284065214009af13abd993c8dea022cd5ba2aa326fe9125e90663dbce489419aaaafcd050c31c9ff943bc4447bd
+EBUILD qwt-6.2.0-r4.ebuild 4152 BLAKE2B e341d65d4bb8f1dabcba04a272b063e0ac427c53d7db4aeab91f9f2b0317d8ef69f03de926b5ffb315d9da0109799b6e40cae5cdee4f6744c9a6ca8fc4d23f9b SHA512 ca89088f750c161747a91353886fab6f7db043454c30fdcdc2da2dd4fb0f9cb01da614ec731130d59da1adba524037ca8b911ffafacce531bc13f4f8c7df129b
MISC metadata.xml 907 BLAKE2B 8d266b1f57bc3190aaa31b66008a7369b5839fd6afd7ba1397590d94b69ce86275f88616c94467229ee9274ba249c3c70dee28ad20c62d3746a2e7855849ab6b SHA512 23fb86847b6d9da0948ad7a1cc4c458da890eab2f1ca1a7ff1dc922b1e482c0de6c20c3787cb74e3ec22062be55febebd69dc307b95186af722e9c2d8c93b132
diff --git a/x11-libs/qwt/qwt-6.2.0-r4.ebuild b/x11-libs/qwt/qwt-6.2.0-r4.ebuild
new file mode 100644
index 000000000000..39bc3513b005
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild qmake-utils
+
+DESCRIPTION="2D plotting library for Qt"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="6/2.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc examples opengl polar +qt5 qt6 svg"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DEPEND="
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
+ opengl? (
+ dev-qt/qtopengl:5
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+ )
+ qt6? (
+ dev-qt/qtbase:6[concurrent,gui,cups,widgets]
+ designer? ( dev-qt/qttools:6[designer] )
+ opengl? (
+ dev-qt/qtbase:6[opengl]
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:6 )
+ )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES-6.2 README )
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_prepare() {
+ my_src_prepare() {
+ cat > qwtconfig.pri <<-EOF || die
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+ VER_MAJ = $(ver_cut 1)
+ VER_MIN = $(ver_cut 2)
+ VER_PAT = $(ver_cut 3)
+ VERSION = ${PV/_*}
+ QWT_VER_MAJ = $(ver_cut 1)
+ QWT_VER_MIN = $(ver_cut 2)
+ QWT_VER_PAT = $(ver_cut 3)
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF || die
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ DEFINES += QWT_MOC_INCLUDE=1
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF || die
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "/^TARGET/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-${MULTIBUILD_VARIANT}.so:g" \
+ -i src/src.pro || die
+
+ sed \
+ -e "/qwtAddLibrary/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "/qwtAddLibrary/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+ -i qwt.prf designer/designer.pro examples/examples.pri || die
+ }
+ if ! use doc; then
+ sed -e 's/doc//' -i qwt.pro || die
+ fi
+ default
+ multibuild_copy_sources
+ multibuild_foreach_variant run_in_build_dir my_src_prepare
+}
+
+src_configure() {
+ my_src_configure() {
+ case ${MULTIBUILD_VARIANT} in
+ qt5) eqmake5 ;;
+ qt6) eqmake6 ;;
+ esac
+ }
+ multibuild_foreach_variant run_in_build_dir my_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_test() {
+ my_src_test() {
+ cd "${BUILD_DIR}"/tests || die
+ case ${MULTIBUILD_VARIANT} in
+ qt5) eqmake5 tests.pro ;;
+ qt6) eqmake6 tests.pro ;;
+ esac
+ emake
+ }
+ multibuild_foreach_variant my_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
+ einstalldocs
+
+ if use doc; then
+ mkdir -p "${ED}"/usr/share/man/ || die
+ mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+ rmdir "${ED}"/usr/share/doc/${PF}/man || die
+ fi
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF || die
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b6f7aa31bd43..f501d4e93dc2 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -21,10 +21,14 @@ DIST wxWidgets-3.2.2.1-docs-html.tar.bz2 18109775 BLAKE2B bb5dad886c2ba64feb9ec3
DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb634760aa214c2d8f85f9b4284700d01390617c275a855fa3ae28481a38233f3a71f8560e5a8a360d7b72ace2603c551327 SHA512 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6
DIST wxWidgets-3.2.5-docs-html.tar.bz2 18205089 BLAKE2B 8bf09c0f9698e72e425a4e4fcbd57498851c93f02dca33fadcd785e04f3927807ff65e8b7dbecaadde64b2bf7653e950a93c5d522ff4e27a8e3baaa85ef6c692 SHA512 cc80c827c4f8607ef38e435eb7fd5dab9fcad5e93ab81bca262d212f5a061b85093d1bc1a1bdc82a7422c4744b6fdd5c82f3142b6a497e85067f571ce9513f5e
DIST wxWidgets-3.2.5.tar.bz2 27539152 BLAKE2B e262860b5d64d30576bbe61913d14c98c7e56bc1f108696abe0d446145e8c8cea3711bae4f3248c7def06ee988ee4441652376113ad2b4f04402249d7c1e6961 SHA512 b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86
+DIST wxWidgets-3.2.6-docs-html.tar.bz2 18221396 BLAKE2B cc990c848517a47664d4b14638aeaf97ffc57df29ae544e4a90bd15bcb2998fcd19f540d2e2453813197cae64a53f336fd259a99f392256cb6456376f3f6c926 SHA512 f2399f8dd205645c7dfd9fbdf89cf0b11145489cad9e218d592c2778f2a8734e6f852c99009b905b649cc0796612389d0755feedcb523b44c9bb3d631964d5f1
+DIST wxWidgets-3.2.6.tar.bz2 27528560 BLAKE2B 6d35a9acd3fa0dbcce3ea38367119eb572c7cf2f63598bac87050d122af7ce6a339892dd5f15d9832e47dac058893fb8b1f4a73db14aa7911a54a31ea52cf22a SHA512 87830a73df096ab35d4ff7e131872131153da76f76c58d70e57558915c3faea280af193104163ce24e9e249a62b8e65d19ebfa20046ce0d2c45b2368b108619f
EBUILD wxGTK-3.0.4-r5.ebuild 3849 BLAKE2B 6990536f9509c3e95db572b82226c7988869c9e9a2fb5a3d719d7f520fb2530ff6569e32c5c2783fe7f469fcb5ec77677c9fdf1924f01424f233aa4de856ca46 SHA512 88b95d38ece8d2ddac4f83c86368147b2c21fc3338ba405bcae8c81fb3540fd276968a7c62d521062ae3b0a34769e10bf4d17a7f9a385a8ac2f1b05d2fb30490
+EBUILD wxGTK-3.0.4-r6.ebuild 3960 BLAKE2B a96cb441dfa6a2bac388ebf8563867782f409ae16a885e5d8b7e9895940fc079ed58e71a1762923065ae470145c21de31f4932b97f32e0df6a7f35c1822d45cd SHA512 d2f6c18496f21bdd65dfe8428caf2c55dc4a6b5944dd5207b8cdc2c19fc5c1ec9579c99f538364881fa499f8abaec59fd781e28df665900e9eaf4bcfc68f3118
EBUILD wxGTK-3.0.5.1-r1.ebuild 5646 BLAKE2B e22efcae6b368013585697a04ac1172eab560c7bd611b130e8220aca1deb0f0bedd1fb1bae015696192ad6adad1f1da5bedd0240e77e91c0a366e857b512cabd SHA512 4087681932cb63dff6967a80cb393c25c4a9c54510b14bd92220b6bf874c5132406a71ada6717a1861ae056ea00a9781c54e3eb011188988bf593a42cc89ccf5
EBUILD wxGTK-3.0.5.1-r3.ebuild 6177 BLAKE2B 26582758e26d72f791697cd9bdbaf1e373d2876012ac4d5767e08d8b67cd6c2b78337e7b3def9f2debbba11ff64bf2de1a9e8078bb86d38f3367add65c498d4c SHA512 3a0ebc816aa2dc14b7a0d38bc0a8e5afa1166fb30350b6bb5a589afd2deebff5c968925e43720423e7fc33e972616e3abe2b8e7ead442f6cb6b669271720f3f8
EBUILD wxGTK-3.2.2.1-r5.ebuild 8405 BLAKE2B 0ae0751334b5920ec4ee9d1f801e8e87f515a0a36c0142c573bb8f27a8db31417150f8e817bd071026461a0955823e8c4411fbff569192f877e4698799e7d016 SHA512 83ffb85d1c03715fdcc20e32408b358205110fc756883c73b8cc0dae5aa917582c11e41cc4dc812a1c7d1d80240c9119f50bb447f1de389235196868368477cd
EBUILD wxGTK-3.2.5-r1.ebuild 8412 BLAKE2B 55c1855da7ed8415b3a6fa74157bc3ce412b1614e2a57824445fcb9cfa0d3a31e2006918595a447541a8bb8ba6679fcba195af230275aac98fab2948043db881 SHA512 ddb3d534a92330156f6fcbaddab7da9b1ec9e17f6e1345915eb5c2c004a08851a5b9d51a767596f1d6e0930b0dfdb2d10ff75abb6c34bfed5fc39b15f0165ca4
-EBUILD wxGTK-3.2.5.ebuild 8242 BLAKE2B e682fbae5c1cc9cbbbefdd2a2b5f9b126eb93db44e169801558f163f107a1e93dabfa6f8f0fc4a15de50858e19ac033d2c1e4d71c5024f032b5053300674ab27 SHA512 017f76e3f0a11e4c7b5677402668e8832d57cbb8cd11ceb1eeb606126201bb723d43c8136a16633bbfd61fecf24355b1ae68d1fc349b72c485dd97e6c127fe06
+EBUILD wxGTK-3.2.5.ebuild 8240 BLAKE2B 1c0db626cb1a9d22aa312fa85fdceeb35ff0c9f08afa7a646d8250d8715b232a85a553e5d8b6ea1ed661bbafcdad4cfc4657dfb12e59ec90de1c62a5435c05fb SHA512 7dee48240944a6106fe4177b9c7f18533b8ab392f7a4bf160e551160d04c0b17cac4e396991962c4cc91eab874e1057a3f2e3bee6bbe267536dc736e4ef08d31
+EBUILD wxGTK-3.2.6.ebuild 8047 BLAKE2B 083c1c4222e84a9a13b8a04dd248a9fdebeb4de6b09fe3c9aa780f8900f6bd19f49fa6172b010d3f3c9b1450562adde46d33b88e8a9ca3e33054b21ae47887de SHA512 c181afe19a32fb9f4340ff890acc04eaa409733a4d5c08d70fa3bfa912840631fd3c6f68f0e17ee9e717a7c5dcb8aa87b6c5663d3e28d43fb0eb1dafcf971215
MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild
new file mode 100644
index 000000000000..284635e1b4d8
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r6.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="https://wxwidgets.org/"
+SRC_URI="
+ https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
+ https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
+ doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
+S="${WORKDIR}/wxWidgets-${PV}"
+
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+ X? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+ media-libs/libpng:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+ )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ )"
+DEPEND="
+ ${RDEPEND}
+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+PATCHES=(
+ "${WORKDIR}"/wxGTK-3.0.4_p20190713/
+ "${FILESDIR}"/${PN}-3.0.5-collision.patch
+ "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
+ "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch
+ "${FILESDIR}"/${PN}-3.0.5.1-excise-autoptr.patch
+)
+
+multilib_src_configure() {
+ # Workaround for bug #915154
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ local myconf=(
+ # X independent options
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)
+
+ # PCHes are unstable and are disabled in-tree where possible
+ # See bug #504204
+ # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090
+ $(use_enable pch precomp-headers)
+ )
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug && myconf+=( --enable-debug=max )
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ if use X; then
+ myconf+=(
+ --enable-gui
+ --enable-graphics_ctx
+ --with-gtkprint
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ --disable-webview
+ $(use_enable gstreamer mediactrl)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)
+ )
+ else
+ # wxBase options
+ myconf+=( --disable-gui )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+ cd docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. )
+ einstalldocs
+
+ # Stray windows locale file, causes collisions
+ rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets &&
+ eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets &&
+ eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.2.5.ebuild b/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
index 6a65c97507ac..42e698eb1ea0 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
SLOT="${WXRELEASE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit"
REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/wxGTK/wxGTK-3.2.6.ebuild b/x11-libs/wxGTK/wxGTK-3.2.6.ebuild
new file mode 100644
index 000000000000..96e3ced48c0b
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.2.6.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal flag-o-matic
+
+WXSUBVERSION="${PV}-gtk3" # 3.2.6-gtk3
+WXVERSION="$(ver_cut 1-3)" # 3.2.6
+# Make sure that this matches the number of components in ${PV}
+WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3
+
+DESCRIPTION="GTK version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="https://wxwidgets.org/"
+SRC_URI="
+ https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
+ doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
+S="${WORKDIR}/wxWidgets-${PV}"
+
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
+SLOT="${WXRELEASE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit"
+REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-eselect/eselect-wxwidgets-20131230
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/libpcre2[pcre16,pcre32,unicode]
+ sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+ curl? ( net-misc/curl )
+ lzma? ( app-arch/xz-utils )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXtst
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ media-libs/fontconfig
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ keyring? ( app-crypt/libsecret )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}]
+ )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ wayland? ( dev-libs/wayland )
+ )
+ spell? ( app-text/gspell:= )
+ tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:4.1= )
+ )"
+DEPEND="${RDEPEND}
+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )"
+BDEPEND="
+ test? ( >=dev-util/cppunit-1.8.0 )
+ >=app-eselect/eselect-wxwidgets-20131230
+ virtual/pkgconfig"
+
+# Note about the gst-plugin-base dep: The build system queries for it,
+# but doesn't link it for some reason? Either way - probably best to
+# depend on it anyway.
+# Note about the wayland dep: Appears to be only required for the OpenGL
+# canvas, and it seems impossible to disable the X dependency, unless
+# I'm missing something. This is an automagic header dep, though.
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-configure-tests.patch"
+ "${FILESDIR}/${PN}-3.2.1-wayland-control.patch"
+ "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch"
+ "${FILESDIR}/${PN}-3.2.5-dont-break-flags.patch"
+)
+
+src_prepare() {
+ default
+
+ # find . -iname Makefile.in -not -path ./samples'/*' \
+ # | xargs grep -l WX_RELEASE
+ local versioned_makefiles=(
+ ./tests/benchmarks/Makefile.in
+ ./tests/Makefile.in
+ ./utils/emulator/src/Makefile.in
+ ./utils/execmon/Makefile.in
+ ./utils/wxrc/Makefile.in
+ ./utils/helpview/src/Makefile.in
+ ./utils/hhp2cached/Makefile.in
+ ./utils/screenshotgen/src/Makefile.in
+ ./utils/ifacecheck/src/Makefile.in
+ ./Makefile.in
+ ./demos/life/Makefile.in
+ ./demos/bombs/Makefile.in
+ ./demos/fractal/Makefile.in
+ ./demos/forty/Makefile.in
+ ./demos/poem/Makefile.in
+ )
+
+ # Versionating
+ sed -i \
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+ -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+ -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+ -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+ "${versioned_makefiles[@]}" || die
+
+ sed -i \
+ -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+ -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+ -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+ -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+ configure || die
+}
+
+multilib_src_configure() {
+ # Workaround for bug #915154
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ # X independent options
+ local myeconfargs=(
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat30
+ --enable-xrc
+ $(use_with sdl)
+ $(use_with lzma liblzma)
+ # Currently defaults to curl, could change. Watch the VDB!
+ $(use_enable curl webrequest)
+
+ # PCHes are unstable and are disabled in-tree where possible
+ # See bug #504204
+ # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090
+ $(use_enable pch precomp-headers)
+
+ # Don't hard-code libdir's prefix for wx-config
+ --libdir='${prefix}'/$(get_libdir)
+ )
+
+ # By default, we now build with the GLX GLCanvas because some software like
+ # PrusaSlicer does not yet support EGL:
+ #
+ # https://github.com/prusa3d/PrusaSlicer/issues/9774 .
+ #
+ # A solution for this is being developed upstream:
+ #
+ # https://github.com/wxWidgets/wxWidgets/issues/22325 .
+ #
+ # Any software that needs to use OpenGL under Wayland can be patched like
+ # this to run under xwayland:
+ #
+ # https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82 .
+ #
+ # Check that the macro wxUSE_GLCANVAS_EGL is set to 1.
+ #
+ myeconfargs+=( "--disable-glcanvasegl" )
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug && myeconfargs+=( --enable-debug=max )
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && myeconfargs+=(
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-gtk=3
+ --with-libpng=sys
+ --with-libjpeg=sys
+
+ # Choosing to enable this unconditionally seems fair, pcre2 is
+ # almost certain to be installed.
+ --with-regex=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)
+ $(use_enable keyring secretstore)
+ $(use_enable spell spellcheck)
+ $(use_enable test tests)
+ $(use_enable wayland)
+ )
+
+ # wxBase options
+ ! use X && myeconfargs+=( --disable-gui )
+
+ # wxWidgets installs a configuration file with a reference to EGREP.
+ # Autoconf discovers these programs via full paths, which is
+ # unnecessary and fails if a build happened on a merged-usr system
+ # but is being used on a split-usr system. Bug #927920.
+ export ac_cv_path_SED="sed"
+ export ac_cv_path_EGREP="grep -E"
+ export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+ export ac_cv_path_FGREP="grep -F"
+ export ac_cv_path_GREP="grep"
+ export ac_cv_path_lt_DD="dd"
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ emake -C tests
+ (cd tests && ./test '~[.]~[net]') || die
+}
+
+multilib_src_install_all() {
+ cd docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. )
+ einstalldocs
+
+ # Unversioned links
+ rm "${ED}"/usr/bin/wx-config || die
+ rm "${ED}"/usr/bin/wxrc || die
+
+ # version bakefile presets
+ pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
+ local f
+ for f in wx*; do
+ mv "${f}" "${f/wx/wx32gtk3}" || die
+ done
+ popd >/dev/null || die
+}
+
+pkg_postinst() {
+ has_version -b app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version -b app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
index 70da15b36ef3..6a9fc3bbdf35 100644
--- a/x11-libs/xapp/Manifest
+++ b/x11-libs/xapp/Manifest
@@ -2,5 +2,7 @@ AUX 0001-don-t-install-pastebin-upload-wrapper.patch 699 BLAKE2B b8acb6a54f18dfd
AUX xapp-2.8.4-multiple-python-targets.patch 2581 BLAKE2B 710b864a41718dbd26263523baa6223e34771ced588152a2a985757979637d2e49eab7257ba1678cea6ffd5aab924f9ddb6e49c6584e97ee11aac48f98622cd3 SHA512 6a82ddb2cf4bff3929366c07613f866f354577cf1d487b20338853bf4bc22efba765405c057a678a02ffc0af1a91f1282693357650031707dbd378fa6de9f83e
AUX xapp-2.8.4-optional-introspection.patch 2894 BLAKE2B 4b6e19bfea20aff1b6a335480382222018a81d2a792e43a046348601c476f5d5f6aa8bb3fdfc63091c3b8187326c0edd4168f1c45fb552a9b279e900e224c9bf SHA512 dcabc7976bb86fe4707b8a8cad1e74d6558d02c62e2121235747eeadc4276d45e6bae3a94c3cfc44ca7f95ab92468be81cbf254750a0e9ec4f144f722e9cafa0
DIST xapp-2.8.5.tar.gz 274241 BLAKE2B 86b38dcab542e934f65e2fb11a5c1e7a5e26e8c725c5c91fed7bec6e0676f40ab6fd85b0421378e4860271ef1c9954d8c5a42b465232670d3d695dcda0734e0b SHA512 133a01309f0bc33a0aa73ee86eb8900573b4ab5b84e9e503b04b246448bce0b05880403288a739c5e252a2276311afba86c9c687887dd6e8c528734e328c6ee7
+DIST xapp-2.8.8.tar.gz 276737 BLAKE2B ad6d33785a2935777bf1dfa96de22edef676280eb7ac48976889c27351010627805c7ebabfd2f7ba7c16ac71ccc65f7306f40f94a045733ff005a841e8b17676 SHA512 0c876d0fa59da10fd079d3c38879ace398dbe99a6351a5437b60c87c2c339799f5228260653d9c03b8efab8c310519fc7edba5eca8f571e683bf06b7aee88403
EBUILD xapp-2.8.5.ebuild 2414 BLAKE2B 91073544e63da6711d6e2d3a8fbb34eca31fff38104f85c75a30806cefa8fb743f3def99b30f5a6f7ee09a024039db8351f44c186ca702d340cdf6aa1de55c23 SHA512 f10f5db6148a5b81ff17bd5eed5f85e258cd2b4f717b5320731bf1c1b27251e1133ce637bf8fe60e397f9e8c8567611a6fbe5746a88ab8a72045345fa8d88d01
+EBUILD xapp-2.8.8.ebuild 2126 BLAKE2B c6816ddf473740a7450553d96f7e76502ca9344368a88fc44f320d0f06600e92d2dcf1a0bd061c2f6cebd89bafd0d162972883b3d9b397f85962366d26aa9fbd SHA512 bcdb586f3de97b5809b34b6156396a6c413476eca8973467111da98c778363b9fb3aef179fa34fa93de509e3182d56f098c59f20eed8f65e1479431673e584cf
MISC metadata.xml 661 BLAKE2B aaf60791b7e8739d7418edd95ff2bfb7429de931c54ccd6c770e752f7f0b45b84a7720add07ecb9ae046064b12d14640b7fe1ab85f6f2a73dc0c0d80eaf13d43 SHA512 27f7fa4138c5d870f1299999711032d7a4c2f628efd8b73ef75d801645950ff9894f970b917501877ef845c0c6fa38ea24c6fa475f25a260f24a2925fcdc47e7
diff --git a/x11-libs/xapp/xapp-2.8.8.ebuild b/x11-libs/xapp/xapp-2.8.8.ebuild
new file mode 100644
index 000000000000..b73207fba46c
--- /dev/null
+++ b/x11-libs/xapp/xapp-2.8.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2-utils vala meson python-r1
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapp/"
+
+SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3 xfce? ( GPL-3 )"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gtk-doc introspection mate vala xfce"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} vala? ( introspection )"
+
+DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ dev-libs/libdbusmenu[gtk3]
+ gnome-base/libgnomekbd:=
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+ >=x11-libs/gtk+-3.22.0:3[introspection?]
+ x11-libs/libxkbfile
+ x11-libs/libX11
+ x11-libs/pango
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
+
+ introspection? (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ sys-apps/dbus
+ sys-devel/gettext
+
+ gtk-doc? (
+ dev-util/gtk-doc
+ )
+
+ introspection? (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ )
+
+ vala? (
+ $(vala_depend)
+ )
+"
+
+PATCHES=(
+ # Don't install pastebin upload wrapper
+ "${FILESDIR}"/0001-don-t-install-pastebin-upload-wrapper.patch
+)
+
+src_prepare() {
+ use vala && vala_setup
+
+ default
+
+ # Fix meson helpers
+ python_setup
+ python_fix_shebang .
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ $(meson_use introspection)
+ $(meson_use mate)
+ $(meson_use vala vapi)
+ $(meson_use xfce)
+ )
+
+ if use introspection; then
+ local xapp_python_targets=()
+
+ get_xapp_python_targets() {
+ xapp_python_targets+=("${EPYTHON}")
+ }
+ python_foreach_impl get_xapp_python_targets
+
+ emesonargs+=(
+ -Dpython_target="$(echo "${xapp_python_targets[@]}" | tr ' ' ,)"
+ )
+ fi
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if use introspection; then
+ python_foreach_impl python_optimize
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 7d109f7324a9..59b66a586a20 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -1,4 +1,5 @@
AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac591c6e107dbda4d9876e93070142e2b8809db93efcf7866cc2adfb1df6e5ad39bb27575e260669606a5c882be13b37 SHA512 0fbbb49dd9dcb5571591ef214fc5318f8a4b09966a8cac6b94d17e1554747714d4aa79387fde970d0e83804397f5fe7e9988ec82164023ab3d2562397ba31308
+AUX xbae-4.60.4-c23.patch 5558 BLAKE2B 3f2c7b6816f9fa85c7cc8f0aa9fdac53c7165a034dfad2cebae11db356593afca9ac50ea390b050aee070a9ff338908e5a970e5bc7ee8cc45f58ec6b006e5b1f SHA512 6887ac4e4f6eda45fb4136fa524fb3fb73f2f9b103ceb17e7929b75eb6c089c164e40cd7466e044346ca9e45fafdb4edededea085f509709faca74ae29a1f3b3
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
@@ -6,5 +7,5 @@ AUX xbae-4.60.4-modern-autotools.patch 1056 BLAKE2B 37dd68c32bb8a80f950b5279120c
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-r1.ebuild 1483 BLAKE2B 8585f1be4bb41e6f66ef69bf9fa8a0096d5b7d2ddc56070831b5ca636b6651ac0a2c50bb07670d13ca8874fe1ccd764cbf2e701dd834522d28848505eccaa2b6 SHA512 2d5e97d1f16db2461fa0e95a0dac982db25505dbd4c46cbc81482f201e697f5c997f99d030636f6f2ebc6641fc496bffe05390a6070b76d4057d49c2a69d7dd4
-EBUILD xbae-4.60.4.ebuild 1250 BLAKE2B 73ecf4bfea40201928d7f4b0bd241f780278a337ece83d96b215e09ad7245c39db2ff515881981860bef38cd58701a8c3f05e9840577724b61b499994baffeca SHA512 c066ca21fbf50439f09f601950f446d2c500208104489004df2b41c373866f311326f7dc1229aeb6f8311168cb87aabbd7e18ee46af9e8e5594d7999722c7d47
+EBUILD xbae-4.60.4-r2.ebuild 1518 BLAKE2B 7705f7c280e5dc3acc7e67da3cc3702db2026b9ccdc1f2e4276977141c349f4be146a7cfffeb01bb79313b90c10dd7e0f93de4c17efda1d9bd6382fbd322f792 SHA512 1f4fb4c3b13a0f34c6536acfb39147c99453cdf08a3272a8bd08c289fbb9dd9117f1e02e4ae66e01f3a7ef72b6132f075b5514e59e5e998e7c48843ad8e68483
MISC metadata.xml 966 BLAKE2B edf4afe356cada257f2c1421d8c3f647ed4ebd4f32e2537a75c681f91cd08edd8328e92eef088bd3e77a8b47c1390920a4cc43697ff34e5e5004d3947353caa1 SHA512 d605fc363f55d3a6db056d2d35b8481ea6c1e900fe3416e11a0295e5cc2a4ad4e63a2b04b027dc544d43d09e54b8d8bce1647f73283f82353f61247360a50d86
diff --git a/x11-libs/xbae/files/xbae-4.60.4-c23.patch b/x11-libs/xbae/files/xbae-4.60.4-c23.patch
new file mode 100644
index 000000000000..2031d744007a
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-c23.patch
@@ -0,0 +1,167 @@
+Fix two remaining problems for C99/C23 compatibility.
+With this, package builds with GCC-15.
+true and false are strings, so replacement is trivial
+and doesn't interact with ABI.
+Casts to Widget are uses everywhere in this program, and
+are correct, as MatrixWidget embeds same core struct from Xt
+as Widget consists of, as first member.
+XtRImmediate indicates that next pointer would be interpreted
+as a value, so integer reinterpreted as a pointer to low mem is
+actually fine, it won't be dereferenced and won't crash whole
+program.
+https://bugs.gentoo.org/944748
+https://bugs.gentoo.org/919195
+--- a/examples/input/input.c
++++ b/examples/input/input.c
+@@ -126,7 +126,7 @@
+ {
+ Widget toplevel, rc, pattern, cw, radio, frame;
+ XtAppContext app;
+- XmString true, false, begin, centre, end;
++ XmString true_str, false_str, begin, centre, end;
+
+ toplevel = XtVaAppInitialize(&app, "Input",
+ NULL, 0,
+@@ -160,8 +160,8 @@
+
+ XtAddCallback(input, XmNvalidateCallback, validateCB, NULL);
+
+- true = XmStringCreateSimple("True");
+- false = XmStringCreateSimple("False");
++ true_str = XmStringCreateSimple("True");
++ false_str = XmStringCreateSimple("False");
+
+ cw = XtVaCreateManagedWidget(
+ "XmNautofill", xbaeCaptionWidgetClass, rc,
+@@ -173,8 +173,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNautoFill", 0, autoFillToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -191,8 +191,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNconvertCase", 1, convertCaseToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -224,8 +224,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNoverwriteMode", 0, overwriteModeToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -254,8 +254,8 @@
+
+ XtManageChild(radio);
+
+- XmStringFree(true);
+- XmStringFree(false);
++ XmStringFree(true_str);
++ XmStringFree(false_str);
+ XmStringFree(begin);
+ XmStringFree(centre);
+ XmStringFree(end);
+--- a/examples/input/pattern.c
++++ b/examples/input/pattern.c
+@@ -128,7 +128,7 @@
+ {
+ Widget toplevel, rc, pattern, cw, radio, frame;
+ XtAppContext app;
+- XmString true, false, begin, centre, end;
++ XmString true_str, false_str, begin, centre, end;
+
+ toplevel = XtVaAppInitialize(&app, "Input",
+ NULL, 0,
+@@ -167,8 +167,8 @@
+ XmNoverwriteMode, False,
+ NULL);
+
+- true = XmStringCreateSimple("True");
+- false = XmStringCreateSimple("False");
++ true_str = XmStringCreateSimple("True");
++ false_str = XmStringCreateSimple("False");
+
+ cw = XtVaCreateManagedWidget(
+ "XmNautofill", xbaeCaptionWidgetClass, rc,
+@@ -180,8 +180,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNautoFill", 0, autoFillToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -198,8 +198,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNconvertCase", 1, convertCaseToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -231,8 +231,8 @@
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNoverwriteMode", 0, overwriteModeToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_str, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_str, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -261,8 +261,8 @@
+
+ XtManageChild(radio);
+
+- XmStringFree(true);
+- XmStringFree(false);
++ XmStringFree(true_str);
++ XmStringFree(false_str);
+ XmStringFree(begin);
+ XmStringFree(centre);
+ XmStringFree(end);
+--- a/examples/tests/leak2.c
++++ b/examples/tests/leak2.c
+@@ -20,7 +20,7 @@
+
+ XtResource resources[] = {
+ { "numIter", "NumIter", XtRInt, sizeof(int),
+- XtOffsetOf(AppRes, numIter), XtRImmediate, 1000 },
++ XtOffsetOf(AppRes, numIter), XtRImmediate, (XtPointer)1000 },
+ };
+
+ int
+--- a/src/Methods.c
++++ b/src/Methods.c
+@@ -1688,7 +1688,7 @@
+ * The event must have occurred in a legal position
+ * otherwise control wouldn't have made it here
+ */
+- xbaeEventToRowColumn(mw, event, &r, &c, &x, &y);
++ xbaeEventToRowColumn((Widget) mw, event, &r, &c, &x, &y);
+ x -= mw->matrix.cell_shadow_thickness;
+ y -= mw->matrix.cell_shadow_thickness;
+ position = XmTextXYToPos(TextField(mw), x, y);
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4-r2.ebuild
index 1feb0ce8fa06..66a6aa37f704 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4-r2.ebuild
@@ -1,7 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+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/"
@@ -9,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
# tests need X display
# and are interactive so virtualx will not help
@@ -29,8 +33,18 @@ 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
+ "${FILESDIR}"/${P}-c23.patch
)
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf --enable-production
}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index db68296faeb9..f0765a1b2ba2 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,5 @@
DIST xtrans-1.5.2.tar.xz 176680 BLAKE2B 6381257bfc489767438e76afe9bab5e9f143e7524417de0396c0d04e42f1ee7ef28cec6fee83a68f60d3d82326c824f1baa9e58c47f7108e4a4d5dc9a2daa65a SHA512 4c4909402cb7df0d69bf2801722de822f7e376d585ff5aa8db8f88be77ed7fb7dfbdc410827069fc5041327e81afeb9d403c6c92e5c1e02d593c829ef6c37536
+DIST xtrans-1.6.0.tar.xz 177156 BLAKE2B c46d0eb3029ad6501f4a81eac3b47970092429a978dde31202f58d52ea675585c320efb91d6aad999097a222882036e05e05f90842980e9eb7d6cf72fda44e89 SHA512 e0ac4a2df0eeacdf23cedd74fee063a8eea81d05c4c4c9a9a113b9b4238db7cacb3c831973ac647fe1a5b06426dcdf0b2f8be5ac27862700333269880e25725b
EBUILD xtrans-1.5.2.ebuild 563 BLAKE2B 130fe3f4860ea7aa187ac94535938e8802fa82a70c59dd75fd3b7d749a4c8add81bd58a42c74f3afc7277f4e0f12357271de3b8db42a57f84ce19cdfd47affa6 SHA512 66b84fa182daefeb9e47b49a59c7baff23aa68dd193288348e55eabfb37df5fc98604789714278b54b50ddfb0e4e32605ec6cb460bb1bb059fd332a37e75ad2f
+EBUILD xtrans-1.6.0.ebuild 571 BLAKE2B a53c058dc4f26cb04796bbeb611f82895d65bf84ad0e878f5a72afb8576c679d535c0759a5e332a8778ac03574df99c223add7c1b06ca42ca0565fc5256353d3 SHA512 8898d9f869e938afe27e784a57d5334c697ee90f32402c65771fba823f8c1cf291e3cafc8238fb4caf7cc779bdd8c54ccdf87353c0aada9f565f41e289d923a2
MISC metadata.xml 340 BLAKE2B a338aaec9199c9b8d4d7104867c9beab0c1363cf8ae64b4c13366ba1d506a8849c9ace547c8ba8f737e5f0cb6f69a9acc11e4a7ed719bad81da5fb44214d33c4 SHA512 1a1504c0e5788a839e01bb8fa84ac557664af8057690b7dca4528253abbc6355bad2899c492a847ff1c4c938ffb2652c6d34a0b6f6efc2a783080a606ad8323e
diff --git a/x11-libs/xtrans/xtrans-1.6.0.ebuild b/x11-libs/xtrans/xtrans-1.6.0.ebuild
new file mode 100644
index 000000000000..97f1c3166c6b
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-3_src_configure
+}