Merge updates from master

2026-09-23 16:49:10 -07:00 · 2025-12-21 19:45:47 +00:00
parent 1bf97233c8 f3da25bc07
commit 41f21763fb
62 changed files with 126 additions and 554 deletions
--- a/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_12 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1
--- a/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_12 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_12 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1
--- a/dev-ada/e3-core/e3-core-22.10.0.ebuild
+++ b/dev-ada/e3-core/e3-core-22.10.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 toolchain-funcs

--- a/dev-ada/e3-core/e3-core-22.6.0-r3.ebuild
+++ b/dev-ada/e3-core/e3-core-22.6.0-r3.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 toolchain-funcs

--- a/dev-ada/e3-core/e3-core-22.6.0-r5.ebuild
+++ b/dev-ada/e3-core/e3-core-22.6.0-r5.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 toolchain-funcs

--- a/dev-ada/e3-core/e3-core-22.8.0.ebuild
+++ b/dev-ada/e3-core/e3-core-22.8.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 toolchain-funcs

--- a/dev-ada/e3-testsuite/e3-testsuite-26.0-r2.ebuild
+++ b/dev-ada/e3-testsuite/e3-testsuite-26.0-r2.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

--- a/dev-ada/langkit-contrib/langkit-contrib-25.0.0-r2.ebuild
+++ b/dev-ada/langkit-contrib/langkit-contrib-25.0.0-r2.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 ADA_COMPAT=( gcc_{12..16} )

 DISTUTILS_USE_PEP517=setuptools
--- a/dev-ada/langkit/langkit-24.0.0-r2.ebuild
+++ b/dev-ada/langkit/langkit-24.0.0-r2.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_12 )
 ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )

 DISTUTILS_USE_PEP517=setuptools
--- a/dev-ada/langkit/langkit-25.0.0-r6.ebuild
+++ b/dev-ada/langkit/langkit-25.0.0-r6.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )
 ADA_COMPAT=( gcc_{12..16} )

 DISTUTILS_USE_PEP517=setuptools
--- a/dev-python/bandit/bandit-1.8.6.ebuild
+++ b/dev-python/bandit/bandit-1.8.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/bandit/bandit-1.9.1.ebuild
+++ b/dev-python/bandit/bandit-1.9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYPI_VERIFY_REPO=https://github.com/PyCQA/bandit
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/bandit/bandit-1.9.2.ebuild
+++ b/dev-python/bandit/bandit-1.9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYPI_VERIFY_REPO=https://github.com/PyCQA/bandit
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/cliff/cliff-4.11.0.ebuild
+++ b/dev-python/cliff/cliff-4.11.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/cliff/cliff-4.12.0.ebuild
+++ b/dev-python/cliff/cliff-4.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/cliff/cliff-4.13.0.ebuild
+++ b/dev-python/cliff/cliff-4.13.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/cliff/cliff-4.13.1.ebuild
+++ b/dev-python/cliff/cliff-4.13.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/doc8/doc8-2.0.0.ebuild
+++ b/dev-python/doc8/doc8-2.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/dogpile-cache/dogpile-cache-1.4.0.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/dogpile-cache/dogpile-cache-1.4.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/dogpile-cache/dogpile-cache-1.5.0.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.5.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=setuptools
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/keystoneauth1/keystoneauth1-5.11.1.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.11.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/keystoneauth1/keystoneauth1-5.12.0.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/openstacksdk/openstacksdk-4.7.1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-4.7.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/openstacksdk/openstacksdk-4.8.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-4.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/os-service-types/os-service-types-1.8.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/os-service-types/os-service-types-1.8.1.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/os-service-types/os-service-types-1.8.2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/osc-lib/osc-lib-4.2.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-4.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/oslo-config/oslo-config-10.0.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-10.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=pbr
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/oslo-config/oslo-config-10.1.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-10.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=pbr
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/oslo-log/oslo-log-7.2.1.ebuild
+++ b/dev-python/oslo-log/oslo-log-7.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=pbr
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/oslo-log/oslo-log-8.0.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-8.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_USE_PEP517=pbr
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/python-cinderclient/python-cinderclient-9.7.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.7.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 pypi

--- a/dev-python/python-cinderclient/python-cinderclient-9.8.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/qiskit-aer/qiskit-aer-0.17.2.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.17.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1

--- a/dev-python/qiskit/qiskit-2.2.3.ebuild
+++ b/dev-python/qiskit/qiskit-2.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 CRATES=""
 RUST_MIN_VER="1.84.0"
--- a/dev-python/qiskit/qiskit-2.3.0_rc1.ebuild
+++ b/dev-python/qiskit/qiskit-2.3.0_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 CRATES="
 "
--- a/dev-python/rustworkx/rustworkx-0.16.0.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 CRATES="
 	adler2@2.0.0
--- a/dev-python/rustworkx/rustworkx-0.17.1.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.17.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 CRATES="
 	adler2@2.0.0
--- a/dev-python/stestr/stestr-4.2.0.ebuild
+++ b/dev-python/stestr/stestr-4.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{12..13} )

 inherit distutils-r1 multiprocessing pypi

--- a/dev-python/stevedore/stevedore-5.5.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/stevedore/stevedore-5.6.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.1.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )

 inherit distutils-r1 pypi

--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,4 +1,2 @@
-DIST vte-0.76.3.tar.bz2 564747 BLAKE2B 1ad65a18ca1aa2371dd74ef3ebaf1aa44358c4a1cbcfa39296fde10e03a76cdbdd2ca7f229f1b4507016e8b986824407d937952a45306eab5e6c0ca5ee9cec8b SHA512 8b7e18831e99ac92159f7b39c6404879cebf22f1f2dcb3feb38cad61f374767f631923c219e153551e9f30ee75c1e8e975fbbf3a6027b9c62ba4f948e3c9f199
-DIST vte-0.78.5.tar.xz 577560 BLAKE2B b1a5a2cc9fee8eb0889d8ed8780d0f65e6d297c60c3c8cf351e1a01942c752d82d13337cd093bb65cb73f5d8c5530783b171f39dac6cd258a8d53340c14d079d SHA512 10c252319e03d3882c197261b572d64c1d12871ac567bcb5f7042d516734ea6f24ade314e9146888eeea427c94ebe472a03d1967af6beeaddf212fc6fd13fe42
-DIST vte-0.80.3.tar.xz 586568 BLAKE2B 5f32cdde611427fc490b443a7df229608b6cff1517da63eec2699db3436d2020ee5f361eccacfc842c66e04a8e4fa11a91ea7a383c18d7bc9d0517393f39a98c SHA512 ef4066c20fe28f301557e4659d2565adf029e600b74527284102234b762010a100d285f33ab93e3539fb70b41bc18b802fdda1a46e2fab241b90a5bd24bd0119
 DIST vte-0.80.4.tar.xz 586804 BLAKE2B 766b25fe9fc45e306db0e65e301b27aa448b2201eeb016c3d25829df28e1c7ac95bc2ca4af97979df92c4f631820761f38574501970af190cb77d0abceb66eeb SHA512 02f76135236dc0bcfbf627614e26bdd24c217a0cc80f369399a67ff0cc2ca6cc12457e31c741c22e50e411db404648d70532b2b3d9d27de1a1941d353d037ae5
+DIST vte-0.82.2.tar.xz 6141828 BLAKE2B d0274f090b00451dc6b63dece2a2a2103c7e58e437e7fae1c94955d3ac7e3aff59c0fc3d2e7ed06921800cb85fcdbcb5b57ea3ef32b832c11a767fbc995fa57d SHA512 73e90beec2672c04476d6673eeac448860faaa00e507f71f6c36122b38bbb5857b2d0b876a928254348ef0f006f5a091e0f09179d23d74d1e05bdbba28c65f74
--- a/gui-libs/vte-common/files/vte-0.82.2-fix-unknown-variable.patch
+++ b/gui-libs/vte-common/files/vte-0.82.2-fix-unknown-variable.patch
@@ -0,0 +1,44 @@
+From f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
+Date: Thu, 20 Nov 2025 18:21:20 +0100
+Subject: [PATCH] Fix undefined variable when building with no gtk
+
+src/meson.build:728:16: ERROR: Unknown variable "test_color_lightness_deps".
+---
+ src/meson.build | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 3320ca0e9..623c68987 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -756,17 +756,17 @@ if get_option('gtk3') or get_option('gtk4')
+   elif get_option('gtk4')
+     test_color_lightness_deps += [gtk4_dep,]
+   endif
+-endif
+ 
+-test_color_lightness = executable(
+-  'test-color-lightness',
+-  dependencies: test_color_lightness_deps,
+-  include_directories: top_inc,
+-  install: false,
+-  sources: test_color_lightness_sources,
+-)
+  test_color_lightness = executable(
+    'test-color-lightness',
+    dependencies: test_color_lightness_deps,
+    include_directories: top_inc,
+    install: false,
+    sources: test_color_lightness_sources,
+  )
+ 
+-test_units += [test_color_lightness,]
+  test_units += [test_color_lightness,]
+endif
+ 
+ test_minifont_common_sources = config_sources + files(
+   'minifont-test.cc'
+-- 
+GitLab
+
--- a/gui-libs/vte-common/vte-common-0.76.3.ebuild
+++ b/gui-libs/vte-common/vte-common-0.76.3.ebuild
@@ -1,81 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic gnome.org meson python-any-r1
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
-S="${WORKDIR}/vte-${PV}"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-
-SLOT="2.91" # vte_api_version in meson.build
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="systemd"
-
-DEPEND="
-	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
-	>=x11-libs/cairo-1.0
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.60:2
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	>=app-arch/lz4-1.9
-	x11-libs/pango
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
-}
-
-src_configure() {
-	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
-	filter-lto
-
-	local emesonargs=(
-		-Da11y=false
-		-Ddebug=false
-		-Ddocs=false
-		-Dgir=false
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=false
-		-Dgnutls=false
-		-Dgtk3=false
-		-Dgtk4=false
-		-Dicu=false
-		$(meson_use systemd _systemd)
-		-Dvapi=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	exeinto /usr/libexec/
-	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
-	insinto /etc/profile.d/
-	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
-	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
-	if  use systemd; then
-		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
-		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
-	fi
-	einstalldocs
-}
--- a/gui-libs/vte-common/vte-common-0.78.5.ebuild
+++ b/gui-libs/vte-common/vte-common-0.78.5.ebuild
@@ -1,80 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-GNOME_ORG_MODULE="vte"
-
-inherit flag-o-matic gnome.org meson python-any-r1
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
-
-S="${WORKDIR}/vte-${PV}"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-
-SLOT="2.91" # vte_api_version in meson.build
-
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="systemd"
-
-DEPEND="
-	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
-	>=x11-libs/cairo-1.0
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.60:2
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	>=app-arch/lz4-1.9
-	x11-libs/pango
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
-}
-
-src_configure() {
-	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
-	filter-lto
-
-	local emesonargs=(
-		-Da11y=false
-		-Ddebug=false
-		-Ddocs=false
-		-Dgir=false
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=false
-		-Dgnutls=false
-		-Dgtk3=false
-		-Dgtk4=false
-		-Dicu=false
-		$(meson_use systemd _systemd)
-		-Dvapi=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	exeinto /usr/libexec/
-	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
-	insinto /etc/profile.d/
-	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
-	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
-	if  use systemd; then
-		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
-		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
-	fi
-	einstalldocs
-}
--- a/gui-libs/vte-common/vte-common-0.82.2.ebuild
+++ b/gui-libs/vte-common/vte-common-0.82.2.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
 	virtual/pkgconfig
 "

+PATCHES=(
+	"${FILESDIR}/vte-${PV}-fix-unknown-variable.patch"
+)
+
 src_prepare() {
 	default
 	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -1,3 +1,2 @@
-DIST vte-0.78.5.tar.xz 577560 BLAKE2B b1a5a2cc9fee8eb0889d8ed8780d0f65e6d297c60c3c8cf351e1a01942c752d82d13337cd093bb65cb73f5d8c5530783b171f39dac6cd258a8d53340c14d079d SHA512 10c252319e03d3882c197261b572d64c1d12871ac567bcb5f7042d516734ea6f24ade314e9146888eeea427c94ebe472a03d1967af6beeaddf212fc6fd13fe42
-DIST vte-0.80.3.tar.xz 586568 BLAKE2B 5f32cdde611427fc490b443a7df229608b6cff1517da63eec2699db3436d2020ee5f361eccacfc842c66e04a8e4fa11a91ea7a383c18d7bc9d0517393f39a98c SHA512 ef4066c20fe28f301557e4659d2565adf029e600b74527284102234b762010a100d285f33ab93e3539fb70b41bc18b802fdda1a46e2fab241b90a5bd24bd0119
 DIST vte-0.80.4.tar.xz 586804 BLAKE2B 766b25fe9fc45e306db0e65e301b27aa448b2201eeb016c3d25829df28e1c7ac95bc2ca4af97979df92c4f631820761f38574501970af190cb77d0abceb66eeb SHA512 02f76135236dc0bcfbf627614e26bdd24c217a0cc80f369399a67ff0cc2ca6cc12457e31c741c22e50e411db404648d70532b2b3d9d27de1a1941d353d037ae5
+DIST vte-0.82.2.tar.xz 6141828 BLAKE2B d0274f090b00451dc6b63dece2a2a2103c7e58e437e7fae1c94955d3ac7e3aff59c0fc3d2e7ed06921800cb85fcdbcb5b57ea3ef32b832c11a767fbc995fa57d SHA512 73e90beec2672c04476d6673eeac448860faaa00e507f71f6c36122b38bbb5857b2d0b876a928254348ef0f006f5a091e0f09179d23d74d1e05bdbba28c65f74
--- a/gui-libs/vte/vte-0.80.4-r1.ebuild
+++ b/gui-libs/vte/vte-0.80.4-r1.ebuild
@@ -23,15 +23,17 @@ REQUIRED_USE="
 DEPEND="
 	>=gui-libs/gtk-4.14:4[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
+	dev-cpp/fast_float
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0[introspection?]
+	>=x11-libs/pango-1.22.0
 	>=dev-libs/libpcre2-10.21:=
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -62,8 +64,8 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
 	filter-lto

-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-flags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND

 	local emesonargs=(
 		-Da11y=true
--- a/gui-libs/vte/vte-0.80.4.ebuild
+++ b/gui-libs/vte/vte-0.80.4.ebuild
@@ -1,100 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=gui-libs/gtk-4.14:4[introspection?]
-	>=x11-libs/cairo-1.0
-	dev-cpp/fast_float
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.72:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	>=app-arch/lz4-1.9
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-	x11-libs/pango[introspection?]
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	# -Ddebug option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk4_api_name/' meson.build || die
-}
-
-src_configure() {
-	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
-	filter-lto
-
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=false
-		-Dgtk4=true
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	# not meson_src_install because this would include einstalldocs, which
-	# would result in file collisions with x11-libs/vte
-	meson_install
-
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/ || die
-	fi
-}
--- a/gui-libs/vte/vte-0.80.3-r1.ebuild
+++ b/gui-libs/vte/vte-0.80.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build

-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -23,16 +23,19 @@ REQUIRED_USE="
 DEPEND="
 	>=gui-libs/gtk-4.14:4[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
+	>=dev-libs/libfmt-11.0.0
 	dev-cpp/fast_float
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0[introspection?]
+	>=x11-libs/pango-1.22.0
 	>=dev-libs/libpcre2-10.21:=
+	>=dev-cpp/simdutf-6.2.0
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -63,11 +66,12 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
 	filter-lto

-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-flags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND

 	local emesonargs=(
 		-Da11y=true
+		#-Dapp-hidden=true
 		$(meson_use debug)
 		$(meson_use gtk-doc docs)
 		$(meson_use introspection gir)
--- a/lxde-base/lxterminal/lxterminal-0.4.0_p20230917-r1.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0_p20230917-r1.ebuild
@@ -17,7 +17,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"

 DEPEND="
 	dev-libs/glib:2
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,6 +1,2 @@
-DIST vte-0.76.3-a11y-implement-GtkAccessibleText.patch.xz 9548 BLAKE2B 2c34f44cff5e1abf00358984c8000a3d7bce3b020be08052d016ca69864f9ab9b1a22ca6709dd5e78a13c8e43a6c4ace1fc1e74f5be83a9988c2b0083880ab95 SHA512 490ec91f27a8a873ee03f8aebb222217c85b2f865e6662dcc5efc1d9fe3765c966d4e9cd8691c4f1779e232139822eb1aa0f464e7090da96c6c17b556f642927
-DIST vte-0.76.3-command-notify.patch.xz 4336 BLAKE2B d3fd8eef9c3322af20ceac4678635edbb00159fa88147a897f655a5920c638da19fff10e08215a891df2cdd5721cd808b6041d84e74980a9f129e07de621526b SHA512 1c974ae97823659bee873036d656423255fae2b71baa4f4221b656055d69d55120f5cccfe3d9e514a64a2c5f87f94c1e4b47b4a2a233faf28ca06a959efe3e3b
-DIST vte-0.76.3.tar.bz2 564747 BLAKE2B 1ad65a18ca1aa2371dd74ef3ebaf1aa44358c4a1cbcfa39296fde10e03a76cdbdd2ca7f229f1b4507016e8b986824407d937952a45306eab5e6c0ca5ee9cec8b SHA512 8b7e18831e99ac92159f7b39c6404879cebf22f1f2dcb3feb38cad61f374767f631923c219e153551e9f30ee75c1e8e975fbbf3a6027b9c62ba4f948e3c9f199
-DIST vte-0.78.5.tar.xz 577560 BLAKE2B b1a5a2cc9fee8eb0889d8ed8780d0f65e6d297c60c3c8cf351e1a01942c752d82d13337cd093bb65cb73f5d8c5530783b171f39dac6cd258a8d53340c14d079d SHA512 10c252319e03d3882c197261b572d64c1d12871ac567bcb5f7042d516734ea6f24ade314e9146888eeea427c94ebe472a03d1967af6beeaddf212fc6fd13fe42
-DIST vte-0.80.3.tar.xz 586568 BLAKE2B 5f32cdde611427fc490b443a7df229608b6cff1517da63eec2699db3436d2020ee5f361eccacfc842c66e04a8e4fa11a91ea7a383c18d7bc9d0517393f39a98c SHA512 ef4066c20fe28f301557e4659d2565adf029e600b74527284102234b762010a100d285f33ab93e3539fb70b41bc18b802fdda1a46e2fab241b90a5bd24bd0119
 DIST vte-0.80.4.tar.xz 586804 BLAKE2B 766b25fe9fc45e306db0e65e301b27aa448b2201eeb016c3d25829df28e1c7ac95bc2ca4af97979df92c4f631820761f38574501970af190cb77d0abceb66eeb SHA512 02f76135236dc0bcfbf627614e26bdd24c217a0cc80f369399a67ff0cc2ca6cc12457e31c741c22e50e411db404648d70532b2b3d9d27de1a1941d353d037ae5
+DIST vte-0.82.2.tar.xz 6141828 BLAKE2B d0274f090b00451dc6b63dece2a2a2103c7e58e437e7fae1c94955d3ac7e3aff59c0fc3d2e7ed06921800cb85fcdbcb5b57ea3ef32b832c11a767fbc995fa57d SHA512 73e90beec2672c04476d6673eeac448860faaa00e507f71f6c36122b38bbb5857b2d0b876a928254348ef0f006f5a091e0f09179d23d74d1e05bdbba28c65f74
--- a/x11-libs/vte/vte-0.76.3-r1.ebuild
+++ b/x11-libs/vte/vte-0.76.3-r1.ebuild
@@ -1,120 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/vte/"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI}
-	!vanilla? (
-		https://dev.gentoo.org/~pacho/${PN}/${P}-command-notify.patch.xz
-		https://dev.gentoo.org/~pacho/${PN}/${P}-a11y-implement-GtkAccessibleText.patch.xz )
-"
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-
-SLOT="2.91"      # vte_api_version in meson.build
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala vanilla wayland"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[X?,introspection?,wayland?]
-	>=x11-libs/cairo-1.0
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.72:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0[introspection?]
-
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	>=app-arch/lz4-1.9
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.76.3-stdint.patch" )
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	if ! use vanilla; then
-		# From https://src.fedoraproject.org/rpms/vte291/raw/f40/f/0001-add-notification-and-shell-precmd-preexec.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${P}-command-notify.patch
-		# From https://src.fedoraproject.org/rpms/vte291/raw/f40/f/0001-a11y-implement-GtkAccessibleText.patch
-		# Migrate to GTK4 and add VteTerminal:enable-a11y feature flag
-		eapply "${WORKDIR}"/${P}-a11y-implement-GtkAccessibleText.patch
-	fi
-
-	# -Ddebug option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-src_configure() {
-	# Upstream don't support LTO & error out on it in meson.build
-	filter-lto
-
-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
-
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	# not meson_src_install because this would include einstalldocs, which
-	# would result in file collisions with gui-libs/vte
-	meson_install
-
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
-	fi
-}
--- a/x11-libs/vte/vte-0.80.4-r1.ebuild
+++ b/x11-libs/vte/vte-0.80.4-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
 LICENSE="LGPL-3+ GPL-3+"

 SLOT="2.91"      # vte_api_version in meson.build
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -28,11 +28,12 @@ DEPEND="
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0[introspection?]
+	>=x11-libs/pango-1.22.0
 	>=dev-libs/libpcre2-10.21:=
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -63,8 +64,8 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto

-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-flags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND

 	local emesonargs=(
 		-Da11y=true
--- a/x11-libs/vte/vte-0.80.4.ebuild
+++ b/x11-libs/vte/vte-0.80.4.ebuild
@@ -1,100 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-
-SLOT="2.91"      # vte_api_version in meson.build
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
-	>=x11-libs/cairo-1.0
-	dev-cpp/fast_float
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.72:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	>=app-arch/lz4-1.9
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-	x11-libs/pango[introspection?]
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	# -Ddebug option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-src_configure() {
-	# Upstream don't support LTO & error out on it in meson.build
-	filter-lto
-
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	# not meson_src_install because this would include einstalldocs, which
-	# would result in file collisions with gui-libs/vte
-	meson_install
-
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
-	fi
-}
--- a/x11-libs/vte/vte-0.78.5-r1.ebuild
+++ b/x11-libs/vte/vte-0.78.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
 LICENSE="LGPL-3+ GPL-3+"

 SLOT="2.91"      # vte_api_version in meson.build
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -23,15 +23,19 @@ REQUIRED_USE="
 DEPEND="
 	>=x11-libs/gtk+-3.24.22:3[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
+	>=dev-libs/libfmt-11.0.0
+	dev-cpp/fast_float
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0[introspection?]
+	>=x11-libs/pango-1.22.0
 	>=dev-libs/libpcre2-10.21:=
+	>=dev-cpp/simdutf-6.2.0
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -62,11 +66,12 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto

-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-flags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND

 	local emesonargs=(
 		-Da11y=true
+		-Dapp-hidden=true
 		$(meson_use debug)
 		$(meson_use gtk-doc docs)
 		$(meson_use introspection gir)
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4-r1.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"

--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5-r1.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"