15 files changed, 610 insertions, 2 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ef138c123f2a..571b42b8ec2e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 28f2755574fd..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 1426 BLAKE2B 6b88403bf1e554f2bda7aef572722176454e59590bd072a89b2d51fead254a5eb489acc7d27c476fd48cd9a2bd5059e6436e5bca2af99449955194ddf71f088e SHA512 52fee63997e71f86cea26aa52575dc163ef6c6a086e2b2115742cd92546b596d7463d5a8adf79b0a2e8efdf696ea234d7212335c179a9d31242fb09e606668b1
+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 5f8d7d15470c..645cc49be096 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~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/libSM/Manifest b/x11-libs/libSM/Manifest
index afc6f1801bc1..a1581da2a39e 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,5 @@
 DIST libSM-1.2.5.tar.xz 312708 BLAKE2B 9babbc5409037d1292c85c0b23ff21975f614e9cfe53c6878761e67489815862a98ef84a2249161279fd5d7af7ff886cfbafb63b82832ee142e513e3d359e6cd SHA512 f2e58503a7cd144a610621104b4727878dd5ba0cdf8220e72f27a3474c9b49c01dc514c60cbdfb35a9318f307b27a601580725cef0f6b5091d4c4ea57cef8c91
+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.6.ebuild b/x11-libs/libSM/libSM-1.2.6.ebuild
new file mode 100644
index 000000000000..c1b7f732af16
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.6.ebuild
@@ -0,0 +1,61 @@
+# 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 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"
+IUSE="+uuid"
+
+RDEPEND="
+	>=x11-libs/libICE-1.1.0[${MULTILIB_USEDEP}]
+	uuid? (
+		elibc_Darwin? ( sys-libs/native-uuid )
+		!elibc_SunOS? ( !elibc_Darwin? (
+			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+		) )
+	)"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}/usr/include/uuid ]] &&
+					[[ -d ${ROOT}/usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-ipv6
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index e590ba9b1d69..974226bdee72 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +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.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/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b483af409f71..f501d4e93dc2 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -21,6 +21,8 @@ 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
@@ -28,4 +30,5 @@ EBUILD wxGTK-3.0.5.1-r3.ebuild 6177 BLAKE2B 26582758e26d72f791697cd9bdbaf1e373d2
 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 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.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/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
+}