From 8bf02d8edf7e8947a205e2dca77bee4c4e31739b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 6 Sep 2024 12:28:43 +0100
Subject: gentoo auto-resync : 06:09:2024 - 12:28:42

---
 dev-libs/Manifest.gz                               | Bin 101495 -> 101509 bytes
 dev-libs/blake3/Manifest                           |   2 +-
 dev-libs/blake3/blake3-1.5.1.ebuild                |   2 +-
 dev-libs/gobject-introspection/Manifest            |  10 +-
 ...object-introspection-1.80.1-setuptools-74.patch | 101 ++++++++++++++
 .../gobject-introspection-1.76.1-r1.ebuild         |  80 +++++++++++
 .../gobject-introspection-1.76.1-r2.ebuild         |  84 ++++++++++++
 .../gobject-introspection-1.76.1.ebuild            |  79 -----------
 .../gobject-introspection-1.78.1-r1.ebuild         |  84 ++++++++++++
 .../gobject-introspection-1.78.1-r2.ebuild         |  88 ++++++++++++
 .../gobject-introspection-1.78.1.ebuild            |  84 ------------
 .../gobject-introspection-1.80.1-r1.ebuild         |   4 +-
 .../gobject-introspection-1.80.1-r2.ebuild         |  90 ++++++++++++
 dev-libs/libffi/Manifest                           |   2 +-
 dev-libs/libffi/libffi-3.4.6.ebuild                |   2 +-
 dev-libs/libnl/Manifest                            |   2 +-
 dev-libs/libnl/libnl-3.9.0.ebuild                  |   2 +-
 dev-libs/librdkafka/Manifest                       |   2 +-
 dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild     |   7 +-
 dev-libs/libwacom/Manifest                         |   2 +-
 dev-libs/libwacom/libwacom-2.12.2.ebuild           |   2 +-
 dev-libs/libzia/Manifest                           |   2 +-
 dev-libs/libzia/libzia-4.61.ebuild                 |   2 +-
 dev-libs/weston/Manifest                           |   7 +-
 dev-libs/weston/weston-13.0.0-r3.ebuild            | 151 --------------------
 dev-libs/weston/weston-13.0.0-r4.ebuild            | 151 ++++++++++++++++++++
 dev-libs/weston/weston-13.0.3-r1.ebuild            | 152 ---------------------
 dev-libs/weston/weston-13.0.3-r2.ebuild            | 152 +++++++++++++++++++++
 dev-libs/weston/weston-13.0.3.ebuild               | 151 --------------------
 dev-libs/weston/weston-9999.ebuild                 |   2 +-
 30 files changed, 860 insertions(+), 639 deletions(-)
 create mode 100644 dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
 create mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
 create mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
 delete mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
 create mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
 create mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
 delete mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
 create mode 100644 dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
 delete mode 100644 dev-libs/weston/weston-13.0.0-r3.ebuild
 create mode 100644 dev-libs/weston/weston-13.0.0-r4.ebuild
 delete mode 100644 dev-libs/weston/weston-13.0.3-r1.ebuild
 create mode 100644 dev-libs/weston/weston-13.0.3-r2.ebuild
 delete mode 100644 dev-libs/weston/weston-13.0.3.ebuild

(limited to 'dev-libs')

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 03fdc12672b6..c7c2a073ab71 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest
index 45fa580be4dd..76efe5019b79 100644
--- a/dev-libs/blake3/Manifest
+++ b/dev-libs/blake3/Manifest
@@ -3,6 +3,6 @@ DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4c
 DIST blake3-1.5.1.tar.gz 242161 BLAKE2B 12712bcc6413f90bd9d79ee87d73b45ee611032ccfa3f9e73b2c41b080c2a9451db028c9ff32efa546bef19b85e4aa9fc5ecd9fc6b76c34fd347cbc5fe337649 SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24
 DIST blake3-1.5.3.tar.gz 244775 BLAKE2B 8d6cfd9b4829d1b0aed790b3e27a5dc8e4e4eb19d9b635faf07bd89bfc99545e9a4c2c362c7a55b44e6ff6d1dad0dc166ba34baf488ed094ed5cff56df21b6ff SHA512 5e8f9ef523735819e9def19911fce906d62d000b4146e7b7a28896f68c925715dbf42da369b1630929b0d2012abb972f0611ffac6184b49c157641bf5b5b1362
 EBUILD blake3-1.5.0.ebuild 480 BLAKE2B f0662530d0ab585a6b2edd863b7dc9c1acc6215d3c2b7f0e92cdb866d92b3ca09a77c1e3b6a522b1f7a7b7613ef5f7d0fe09cc64ec0038bccfcfb2771424b28c SHA512 8efb675b88b3cf0c9c999bda8910c3ec75e2be8bbf45261b46d9602dacc6b8c09ac08297600a1d2dde079ee8b1d70457a020ea48a6a85fb36c920e143314cba7
-EBUILD blake3-1.5.1.ebuild 483 BLAKE2B d70bb68f98b9aa79fb2b6f30c49f4ab0c85a3d9dbc4012ce830b0fcac73ec517faf579d96724f9b78facf56445f0cd23e1a2e7ea385d4b3e140233b14a1ae5ba SHA512 9be2b2e24e8a25e28295c86a2ae8c4137d08420da2011f685eb178b8e4c135e2ffedb623c3c75d133034f48c9b40122c9c519e23b8ccfd809bd73ca6c96c349c
+EBUILD blake3-1.5.1.ebuild 479 BLAKE2B 84543db5d015b32666e5fc941edef2e6e59eb0e92bd76e3ea2a57a3003e55101954b76245d1487bd3c5ed6568628eb518671eb3c76318aa7778356dace474373 SHA512 a06caa2863124c33c47b99d4e25efe56cab3b083cb5ad087be203eabe632d7565ffa2bac120035260d0b07ff4d63de6ced770dfe366e372da6faee17d5141250
 EBUILD blake3-1.5.3.ebuild 863 BLAKE2B 716951a87374f5973235c9abbda9a341da81e117990ee2d01872a9881b9cb0e7274634c0e61c21192119e56add734bf2166af4a660f23e2043fadc4c4c0bbc04 SHA512 79698a1c15775b8ebf9679a51ce66e54bf1dd5b55a961ce83310366a455d6f750a7c50ae94a9d35578edb71a17bd83c191d2fe108bb9ca863da3125114052e49
 MISC metadata.xml 331 BLAKE2B 04a0d860646b72b60fbc082a4f28fa681e122d6f53dadb858777c4054b1bedb9eb33929758ba0693c72f56b69abe3ae88a69e3fc4460d4e1acc0a9c82f26239f SHA512 849d76599dcbdf00b4fbd501eb2b3cb123dc930418e36ea65701fed34e82d8353624122018b0f1e759a583c38285b14f92b6c89a615512e6646af908efb079cf
diff --git a/dev-libs/blake3/blake3-1.5.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild
index 0909ad2023ce..abcd89da9ef0 100644
--- a/dev-libs/blake3/blake3-1.5.1.ebuild
+++ b/dev-libs/blake3/blake3-1.5.1.ebuild
@@ -12,4 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 9af7a0c1dd90..ce4b8121c601 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,8 +1,12 @@
 AUX gobject-introspection-1.78.1-tests-py312.patch 2770 BLAKE2B 18e74962bddd40e754225b14eac1a631a6aaf4ec2be81a172119438b9cf3adc248c71153d98d069af464366896eb67dae7aaa80cea5592d88f2d5c6f5a1a4f28 SHA512 c0d9c020b0506966d7a98f9d708464128721c9bd8ff23ed74f4fbe82e1b4c7d7aa19c960ebf39cd1c58836ece14b56284f64ccbf678a017181c48eaade904272
+AUX gobject-introspection-1.80.1-setuptools-74.patch 3808 BLAKE2B 37e4fb3c06cc563731b990f0ab2e02be5226adab793845f78a77991f56374c7ed339d8981476bf6a8677b4507204f63f92620bc83e5a19a1b96eaefbb3b3451f SHA512 48ac47cb828fc895107ccbfe08db31a535de3c80c4cf8f621f4d923d1a37c090eb9a3d8ddbe2c37dd70714ca10043b787a0dd0390236f6b9a58d08e4e4eb5e15
 DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916
 DIST gobject-introspection-1.78.1.tar.xz 1060296 BLAKE2B 115cf9ea27cec2d8d3a84081c909b72144fd1568bc316677c26f49652dc93b34fba10701678ad4977dcf97a89f7608545fbd2d73c2503c87635b2102e66ae024 SHA512 a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97
 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
-EBUILD gobject-introspection-1.76.1.ebuild 1960 BLAKE2B c399a1996b2f45bf4dbab33e5d2a5e1773066eb7e2d6761102733c4cbc2ac4ac42e4aaa21fa8eeee172f07e1307d737e33b065482e8007b4517af305bd923c44 SHA512 dd66aaa7dbb68ac507800fb1b7f07f08944120c6bc394461f6ec5f35d84ded3bc65ef722744363f96806f713fa66fd1815152af795661f5b3583cde8cd68dd03
-EBUILD gobject-introspection-1.78.1.ebuild 2079 BLAKE2B b2474e1d98196407e1b9de23948e03b7760746636fc7008bfd7684b4845285033f93b77588b2b22259077d7451ab706e065213a0835ce9c09f8d3e5d81d9283e SHA512 5884026cf73b3f852a0404f8a1b4cbd6d11618584ff4155577ae6558e18923fd5c521c04c2e5c60790beb296eb597ffb9d10ce344bca3db14b97d5aafd35f260
-EBUILD gobject-introspection-1.80.1-r1.ebuild 2049 BLAKE2B 1eb96bb1af52944aeac6fef02dbfb22054eb093d4231d481de47225201b1456370a9d9a5c694906e27fbe4281aba0fd5b84eb2420b16e05ca93423f694c13e3d SHA512 a507aa2817efe9b2443aaab3c894a048203050d281ca88c0963f78999c487ebd81c1ecf4b1e11370a1aea252641fab3e32b6c5b58344c56408daec135a7796e2
+EBUILD gobject-introspection-1.76.1-r1.ebuild 1988 BLAKE2B ae54185dce321096e8e8e1ea9429c2cfc3512bfa42c0353b810eb46eb1fd365cd39972b1c84fe81fa355a6c98920cf688829124e3a9ccda672529e3d4bc905da SHA512 d60b13c7a3a6adce014e8eabbfac210fe0ff74158d15c98a65b9cf7f8772f1cbbcf0e522ea92eb4788b71a7467d1e29d38cad0413027dbb56be44907268f79ae
+EBUILD gobject-introspection-1.76.1-r2.ebuild 2107 BLAKE2B 0128d5710c64c941744888af5d0b658ba80e64018dab0fe82c9b380b20b99216af06688aa23c116317abecf67000af0a32a22967f07613435e268e62b64a8898 SHA512 affe96f4c6046cd80d851bb2503af11c60591c5a1af8a6399ef81b021bf860f3362cae8c604b4b6b58351fe3edde2d7e6e9ea0cfd10999ddad4e03035ce3ba09
+EBUILD gobject-introspection-1.78.1-r1.ebuild 2078 BLAKE2B 78c094f18c77fe2688f4cf00f42d998c4c8a1c0bb291900b841ada0659e8b07d8af46e657e532f093edddc1bf4b0ce5ff757bbb943b600931f2ff25d727af7c6 SHA512 c699cdade41fd5b8c765e09f303d1942b1668ab0a29a75970812156374ac01fa57fe0b3bc8cc2c3e1e4ca402070f68b6774d158960b9ff7aa88f61f9f4b19ea3
+EBUILD gobject-introspection-1.78.1-r2.ebuild 2208 BLAKE2B fee9a2251a1f1dcacc9a664f553bedca84c96d1285bec61fd0091557232af127fca79b20642ed9a39ccb631beba0c6ae356954c7f9273e9f5507cfae09faa667 SHA512 5027ac87fb37c515055712744466a415369c8146e005c14de23d930adaa332e4ab6b0a14de88bf6c96f3a0bc921d27366b781f94741f8edc7a7a3b1edcd9af74
+EBUILD gobject-introspection-1.80.1-r1.ebuild 2048 BLAKE2B 315fc04060f5c30154c728ed3b28411705e6aafe0cb611e6d49fe61113ca25a0cc21e24be365994bc9dee4a68e250eabc67a505476397f99c408c4027dd12002 SHA512 cd9ecaddf93479ef17f8426a8782b316745e3f052bb91f2fa4b0e7eaab55d1fb185f11c90d602b4da4c9f6cc90be18223347124e956faac05cbfc9310f2601b1
+EBUILD gobject-introspection-1.80.1-r2.ebuild 2182 BLAKE2B e5c60e75e642a8812c7e1a5e6bd8551f031d393da7a5b45b2297515b810e05300f722a47faf60829b4a694668bad3836ecf5620191b74865d353a3a4359e4c98 SHA512 9c7d01922ca16f2d612d6976d0efc762e18246bc905ce0058451d694a98eabfe45bf2cdd88fd09d5ca92a43bc06e0efd212489fd24c9badb4350707f5e0ff9b9
 MISC metadata.xml 485 BLAKE2B 6ecc9396bcb29a8365be4058592c307ddcb0cc16ab56723ca32a378b5608b86378ab291345a6a3ccbe8225c6ffc91b6ba1e2996b5b0d1f4271d0757bf376ef8e SHA512 43a479854b1d5783c028ecfd8357a632db089f95de9e703608de7f229a37beee5e43781ff3f68b2dfa9bceac1355597373d31d209fdea0301917be5fbe7e7fbe
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
new file mode 100644
index 000000000000..712fafe27946
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
@@ -0,0 +1,101 @@
+From a2139dba59eac283a7f543ed737f038deebddc19 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Wed, 28 Aug 2024 21:26:02 +0200
+Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
+
+It was removed with setuptools 74.0.0. Since we still depend on the
+MSVCCompiler class use new_compiler() to get it some other way.
+
+Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
+which we no longer support anyway.
+
+Fixes #515
+---
+ giscanner/ccompiler.py    |  7 +++----
+ giscanner/msvccompiler.py | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index d0ed70a3c..9a732cd5e 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -26,7 +26,6 @@ import tempfile
+ import sys
+ import distutils
+ 
+-from distutils.msvccompiler import MSVCCompiler
+ from distutils.unixccompiler import UnixCCompiler
+ from distutils.cygwinccompiler import Mingw32CCompiler
+ from distutils.sysconfig import get_config_vars
+@@ -167,7 +166,7 @@ class CCompiler(object):
+         # Now, create the distutils ccompiler instance based on the info we have.
+         if compiler_name == 'msvc':
+             # For MSVC, we need to create a instance of a subclass of distutil's
+-            # MSVC9Compiler class, as it does not provide a preprocess()
++            # MSVCCompiler class, as it does not provide a preprocess()
+             # implementation
+             from . import msvccompiler
+             self.compiler = msvccompiler.get_msvc_compiler()
+@@ -460,7 +459,7 @@ class CCompiler(object):
+             return self.compiler.linker_exe
+ 
+     def check_is_msvc(self):
+-        return isinstance(self.compiler, MSVCCompiler)
++        return self.compiler.compiler_type == "msvc"
+ 
+     # Private APIs
+     def _set_cpp_options(self, options):
+@@ -486,7 +485,7 @@ class CCompiler(object):
+                     # macros for compiling using distutils
+                     # get dropped for MSVC builds, so
+                     # escape the escape character.
+-                    if isinstance(self.compiler, MSVCCompiler):
++                    if self.check_is_msvc():
+                         macro_value = macro_value.replace('\"', '\\\"')
+                 macros.append((macro_name, macro_value))
+             elif option.startswith('-U'):
+diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
+index 0a5439820..e333a80f5 100644
+--- a/giscanner/msvccompiler.py
++++ b/giscanner/msvccompiler.py
+@@ -19,30 +19,30 @@
+ #
+ 
+ import os
+-import distutils
++from typing import Type
+ 
+ from distutils.errors import DistutilsExecError, CompileError
+-from distutils.ccompiler import CCompiler, gen_preprocess_options
++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
+ from distutils.dep_util import newer
+ 
+ # Distutil's MSVCCompiler does not provide a preprocess()
+ # Implementation, so do our own here.
+ 
+ 
++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
++
++
+ def get_msvc_compiler():
+     return MSVCCompiler()
+ 
+ 
+-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
++class MSVCCompiler(DistutilsMSVCCompiler):
+ 
+     def __init__(self, verbose=0, dry_run=0, force=0):
+-        super(distutils.msvccompiler.MSVCCompiler, self).__init__()
++        super(DistutilsMSVCCompiler, self).__init__()
+         CCompiler.__init__(self, verbose, dry_run, force)
+         self.__paths = []
+         self.__arch = None  # deprecated name
+-        if os.name == 'nt':
+-            if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
+-                self.__version = distutils.msvc9compiler.VERSION
+         self.initialized = False
+         self.preprocess_options = None
+         if self.check_is_clang_cl():
+-- 
+GitLab
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
new file mode 100644
index 000000000000..47d0dfe21616
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.75.0:2
+	dev-libs/libffi:=
+	<dev-python/setuptools-74
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
new file mode 100644
index 000000000000..c0dcfeffdea9
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.75.0:2
+	dev-libs/libffi:=
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
deleted file mode 100644
index dd5dc146ec03..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.75.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	app-alternatives/lex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
new file mode 100644
index 000000000000..899547ef007e
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests-py312.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
new file mode 100644
index 000000000000..2387e4af0ab7
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests-py312.patch"
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
deleted file mode 100644
index b9506b1ab48c..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://gi.readthedocs.io"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
-	dev-libs/libffi:=
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	app-alternatives/lex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-py312.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
index 511ec1bdb784..0fb774a4c879 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-libs/glib-2.79.0:2
 	dev-libs/libffi:=
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
 	doctool? (
 		$(python_gen_cond_dep '
 			dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
new file mode 100644
index 000000000000..92368b5dd6c0
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.79.0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		-Dbuild_introspection_data=true
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index a3e94de4b09f..5a52812d2f05 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.4.4-trampoline-c99.patch 1174 BLAKE2B da7990d940b5b0e6944c5b87d599c
 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
 DIST libffi-3.4.6.tar.gz 1391684 BLAKE2B af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88 SHA512 033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39
 EBUILD libffi-3.4.4-r4.ebuild 2546 BLAKE2B 08bf9ad645d6bddbf45b08ae05f54e201de8fe3f2ae0053af8751eefc95ef1f1d45d1494cc547de0c0898f72d83ead578d3cbe6d1167da4e3eb712824ea6bc9b SHA512 68924a71d8d0137c1f071cbd5cd6d385d1f710bbe527522d5ce96089a9df3b275b384faa3904da31fb3c98f787d701bcd5d629d71ac94c8559ff839ca9fbfcec
-EBUILD libffi-3.4.6.ebuild 2284 BLAKE2B 6bbe0dff74bb200acc138490e997874bbc04d51ef94f07f62d9b70989e56af36c159488fc4dabce93a7b807dd588184c64099e2ebc460eb6c0f548812cb3a613 SHA512 35db3a0397c54acc79e657991144cbfc19e39dd4deba63cecec3eaf256a315b3b599aa28c8c6929a6b1841124d28323402b352937f7df8a4109fa16f47e960bc
+EBUILD libffi-3.4.6.ebuild 2280 BLAKE2B 059e6b6565dfdc70786e1f0ad45aa6959ccf27965bde9ca0d6729b5daa71b9ed4dcacd22e03b7353631f1564179512c92e630615f76a4bcd8a5cc8f089a8d042 SHA512 88bbc7ec698b57f736854188293693a3833540bd4025ecbe42f4b8705714d1fd61b15786e078569724f0ab5c1b77bc21c8c8ea981b41bf6a8aeabd2d34231cd3
 MISC metadata.xml 2110 BLAKE2B 2653be2cf09c047e45e489d7265d00165ddab2f94744988e4e8bca449bd1e40eeab74cb0b8d7d47a2d8b73563869460fcccb06e1fbccad697a9f213be362cb03 SHA512 e1a280792b929d38451fea1eb360053ed3a452592094f3e327ce4a4ff7eb8e0119435e8ee98f215585d8d98440512b5b68f92d1cd472a3bfd12e2f382e1981a1
diff --git a/dev-libs/libffi/libffi-3.4.6.ebuild b/dev-libs/libffi/libffi-3.4.6.ebuild
index 999a90fa9eaa..4c3e3bbcad97 100644
--- a/dev-libs/libffi/libffi-3.4.6.ebuild
+++ b/dev-libs/libffi/libffi-3.4.6.ebuild
@@ -18,7 +18,7 @@ LICENSE="MIT"
 # Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
 # with FEATURES="-preserved-libs" or another package manager if SONAME changes.
 SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug exec-static-trampoline pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 94de9a3ba07c..cee345ee66ff 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -7,6 +7,6 @@ DIST libnl-3.9.0.tar.gz 1074117 BLAKE2B 56a39aad9aa15992ff02fe35732abbc5ed5d107b
 EBUILD libnl-3.10.0.ebuild 3142 BLAKE2B 934ddc2b38047e2241ee0251b86b0f0e8ba8ce1dc7f0338b4f38aa3ef84f909b6d64896a4bbe1cf2be2c8d9e9be73f84f7a9c1168b25defb39765c50d85028ae SHA512 27315af8cb38af43ed2fa0e6e38a14f797629a88b83bca5d8ff00c081841efdb16aae94b2c4bd0d285909dcec2ca46228f88e13f7f4a96e2700e1a9faca8e9c1
 EBUILD libnl-3.7.0.ebuild 2716 BLAKE2B 53df8e8de5b0766d76ec3bac46f7bbb7036183826078facd5b18232b2cf56d6f6a2b4e48a7a30793f7d6679e6772d0654a842192b9f612735de50aa2f3a04aa5 SHA512 f7d6d003d92e623df28822ea643b75679c3711671286f0ffb6cf7334f5de10f86a57c4255f34485e8dce8d107cbf05fec0a90bdc3a496f7f2b9a1ec811e50df9
 EBUILD libnl-3.8.0.ebuild 2991 BLAKE2B 179709af910f08c90c31e08cf9ca3b3eb698b91a4e27789d1eb274b5f725b9d1531ddc0eb9ec71e627c7d81150b9fdba643a026e2fbcaad18b61b702843abfed SHA512 a60ea1a62e9ba874915e08c3b139f8d81391d74029c660af653aba2056dac7450d853a19d59d38ebfc2db01153fabc2f2c5e661c5894056da34c1def929972a1
-EBUILD libnl-3.9.0.ebuild 3136 BLAKE2B 55faa83c9d1bb6c3cd39a897008b8054f159d665a93eb3781d88bc5850af7f52bffa8a940727f4c38858003b544149f8ac9b3a2f652ff9f4a3c361da00473f77 SHA512 0000bbe52690dcf41dc39d1760a76269cc58690ef77feb718057b078b69f4304a213dcf536596ecb3bc6d85685b8590cdefb68721887ea92685a6f62786e1520
+EBUILD libnl-3.9.0.ebuild 3135 BLAKE2B a0da8a6dbb28f778cfc2f5470951a2428cfa7f74a86662bdd12f5ba191adb0eee62bf2104dc97f14c117d7e71d1463b50ab2ea6a24beffb543665825c5f7693a SHA512 80c837ef1013bbee20048b2bd6c36713dcd80831823df7ea12b4eb8f6afa425b0578b78e8f5a5585814eb343d4251cae43ef489a6611c727d42a88d4960a67c9
 EBUILD libnl-9999.ebuild 3142 BLAKE2B 934ddc2b38047e2241ee0251b86b0f0e8ba8ce1dc7f0338b4f38aa3ef84f909b6d64896a4bbe1cf2be2c8d9e9be73f84f7a9c1168b25defb39765c50d85028ae SHA512 27315af8cb38af43ed2fa0e6e38a14f797629a88b83bca5d8ff00c081841efdb16aae94b2c4bd0d285909dcec2ca46228f88e13f7f4a96e2700e1a9faca8e9c1
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.9.0.ebuild b/dev-libs/libnl/libnl-3.9.0.ebuild
index 157fe4e901fc..516e08b45d19 100644
--- a/dev-libs/libnl/libnl-3.9.0.ebuild
+++ b/dev-libs/libnl/libnl-3.9.0.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 000c7593360c..3d68960e3335 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,4 +1,4 @@
 AUX librdkafka-2.2.0-backport-pr4449.patch 12334 BLAKE2B 1787951e628e64890e1a84203f25609d0488ebf8508e16214a9c9c97f23b853cbd86d1b5ceeb3f00d9118245bf9771ad5db82f5db60c37f1c3d2ba493bf3fa4a SHA512 4e8e2de48025ec7b17c070d1e830a8bead9470d283e26ed0b4a9c7779cb2963cd129e59283da07d44f5a46917c783b026367ce575c6a3d103759e7b64855d937
 DIST librdkafka-2.2.0.tar.gz 4340164 BLAKE2B 394c9fd25db0a3a02b16fec3d5d5acc4808b4c8a6c8e025e71f15a91c6311206bf4d7c863860be36483c150bb10955cdc98ba0f088fa493b20ae52154e2a83d0 SHA512 1a85b5864efdeece1327e461b62a378f24b73eb7174168f630aeff01d4a5074d6b2f15744bc267665fcfc6384e804df00c20b7271ecd85a98dca84746b86b4d9
-EBUILD librdkafka-2.2.0-r1.ebuild 2495 BLAKE2B 21cac5dfbfc61f27ceea8d88cb78956274835d2fd3cb2b4ae5f3a3cd8740e4ec5a8401b76150501050dd9da273e0ece8a1760dbd027834c95f5b202db378f7ce SHA512 ee2800213c052dcd1434af8ecc5665498a2bcbeb212347d08be431b383f52ae627406f55f363261fbce5986e5b495ba420ae922f7c16b70e4cd565e6b87013cd
+EBUILD librdkafka-2.2.0-r1.ebuild 2669 BLAKE2B 2d555ddba7a78a3666266accfd03438273b6268b1f1dd3e437fa6f7f33fd1df90d224534cac145aaeadb9fe07736f1222fafa292ff73ad9055a36e44b54c8571 SHA512 3d8509bc325323ac8200b0087f0289f583898dbe07284f1c660a5dd93ec243d89b769a089346eae372fc2b81babb60344b25cc78f23cc5855fce2c6a34e4f5ed
 MISC metadata.xml 458 BLAKE2B 9fe3256ed33cb5691e327d86d5276cfa37e898e938c623f0643bf6cb583e4ee6bd34922880185bdbabc638e2e85ffe157554ff95063db7a348fc9e6f425411e6 SHA512 84279a77f53332007509a0912059a5fb71fed16f0976dbdad200f7a0ff54cff43e17d94afa05f8169181c3fd1aa18e93f6c2e4e279e01cbe9fefdaba46042e7a
diff --git a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
index 86c99f805fc2..166326818146 100644
--- a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PYTHON_COMPAT=( python3_{9..12} )
 
-inherit python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Apache Kafka C/C++ client library"
 HOMEPAGE="https://github.com/confluentinc/librdkafka"
@@ -66,6 +66,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# error: unknown register name ‘%edx’ in ‘asm’
+	# https://bugs.gentoo.org/895464
+	# https://github.com/confluentinc/librdkafka/issues/2426
+	filter-lto
+
 	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
 
 	local myeconf=(
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 867d625abd19..f72504755687 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -3,5 +3,5 @@ DIST libwacom-2.11.0.tar.xz 116056 BLAKE2B 2091859e036d928bc62543a56ea6ca0e2a879
 DIST libwacom-2.12.2.tar.xz 153600 BLAKE2B f2a965d1990e8d2aa248d9d81f31f50e2602c66e3cbc41dd0638994c955b30a5e4be445041e8ac5240b336611f6fb3217779142e95fc3c5265860ebc4f918c41 SHA512 34f80f6c5bdb62938874978b2761d71a1da4629969550ac87b08eb132e88bfb67b56a4f5fcd687e4607a18ef8b34262ba9c4cfc0fcf6a1a6bb98c1a05ded0b08
 EBUILD libwacom-2.10.0.ebuild 1435 BLAKE2B 13773e63c537c2ad33503314b75cbba8510cb67bd82382ecf8f5117c570badb00d20d2fe59e5f1f19ce09e4cd24d2fcc150e1609f571229d96cd25b6c6a94fcd SHA512 51396664c5527d44e936cba7290d3fe6799fc2713a65d060974d2240241ce3229fb711b2cbccd71065df3ab705af733227bc41ada9c7e849cfa9e3d6569c6e52
 EBUILD libwacom-2.11.0.ebuild 1441 BLAKE2B b6aed7374a727797f344308131ebe6ad0ff2fd714cd714d8baa989d3d0687f4f810f7f802995d032419466d109542b476fa1556737475b74292a37d937d278d1 SHA512 1ec1f64c35162f54e1cd5e2c8e87cc7107a68c44a712cd3efbce5f53d037aef7aae8de99f3a12c651372b4735ba199292f0828bca968f7984eee29d03b6e246b
-EBUILD libwacom-2.12.2.ebuild 1445 BLAKE2B 10973e963dfdba7d4b1f0aa88cd1fe16226ebd5473203804f40090e809c0037272ad454ed66bd190d441e9f964fded1147ed53c1d05b3a0d38235e83c9478d2a SHA512 8b9471cc9d985116dae34cd27c1215925aed1fa61f6d853caff3c258ce4c13a4597285452ebe52d001d8007e74f2028863a22b3bf12d558dfc256115799ed928
+EBUILD libwacom-2.12.2.ebuild 1444 BLAKE2B f5e28787c5fe8404a544b67aaa1cd0e28ce978f2725a770ef9e9fe87031771630aa28440b326ebbedff1dd7216ee481c23ba3dcc98bcec7516bc0b9189282309 SHA512 d07e5bc24315231e096cb9c1b518bdcbe663f3b5c53fe1a4525f902b67ee3a317ee29c60c2d5a3495eb6dfebdd1c6d8345842b4b4897cff9a3e9d0566e3c17aa
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.12.2.ebuild b/dev-libs/libwacom/libwacom-2.12.2.ebuild
index bdecada8c47f..3a883e511b11 100644
--- a/dev-libs/libwacom/libwacom-2.12.2.ebuild
+++ b/dev-libs/libwacom/libwacom-2.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index e63ff894d825..c43f2538b096 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -3,5 +3,5 @@ DIST libzia-4.60.tar.gz 649512 BLAKE2B 22b67d33c20c924185223ac623036854915e62164
 DIST libzia-4.61.tar.gz 649569 BLAKE2B 992f7d7a4f2a7497d490a32b04c2f67e45aef361d4f55bd24ab873b3a422f2bd2a23501c275d6771459b5ebe5d169fc28123a4fd328f0977a639fa92991ba62b SHA512 210104a16846b4bbae51e91cd88428cb8b6f487a6bc234a8a7351d03865ff968bf75d102dfe5657f9fc1c181e2071a4e4ab6be0e22da277188f3ab9752ea789d
 EBUILD libzia-4.59.ebuild 1173 BLAKE2B a8e94133ead4a6033ab21e613b0ffc7703e7a47a00e590c759ee64040340aff1e3d6c227e70325d07ca4d9a6f82f5d812fb53c3fe423a4d4cae2abb3afbe24f7 SHA512 e58da7687a8617a11a5ffb5953ca97e051f9e57292c5091cf64ca954efb4762482e47df5f14eeed7935b322f3205e174a34664f30f7a49e228e6fdfe6b83a4f1
 EBUILD libzia-4.60.ebuild 1175 BLAKE2B a0ad9d0f1526973f04cb54faaaa9ccdec9f49d1e4b5ca1040e42ea7ab9b8d04cb6341e3455a5a924d7a78db35f231c0b13b95ed83e21d29bc5f921b0240e2c44 SHA512 0204c23a2ac93ae2551ee8293ab5e884b97f3f498d913ea8b796d3f1d14b69c6f21aaa19fe0e8add7865dd6230ebea72c1fbb3a1a2012b921550262c3347dd96
-EBUILD libzia-4.61.ebuild 1194 BLAKE2B dc2a684fbe620ca80e26d2b8ce85f7a4f9f67a55dd93c4deae51b39a9e7a19bee310f98b36473988771f08aa922a55d2dd2082956c0443c09fa13496f7577f9d SHA512 31190be0bccb1b5079d131d0c5af2653df3d0f6ee41c6c59f955dd116fc09d5b0ed143acf380f4dfce299e2953bd669a734265d087e45da4d994fa14e76ed17b
+EBUILD libzia-4.61.ebuild 1192 BLAKE2B ad0b154d8494e3b7415eaa8dc6f1d421196fd13da93b63edba012155fbf62470709c125e5c36524485045c20e1272edbe1efec5c7a4f5ff73aaa16b7f170b720 SHA512 12b3a534a7a60e96e347452cc74394a1aa31eb48bf0ed059fff036821c7acdd8cddead73165ae9b20384208867e92d2844bae6802b3e2daae07abf98b9449128
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.61.ebuild b/dev-libs/libzia/libzia-4.61.ebuild
index 7bc214eded10..44c174497d96 100644
--- a/dev-libs/libzia/libzia-4.61.ebuild
+++ b/dev-libs/libzia/libzia-4.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 68215029ee92..d84d10884803 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -3,8 +3,7 @@ AUX weston-musl-basename.patch 2369 BLAKE2B 87b49e150f4f390bb9ce131f9cb85198d95a
 AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc SHA512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb
-EBUILD weston-13.0.0-r3.ebuild 3901 BLAKE2B 50f7dbb9b15be8659a1fac247927304c1af5b588909ac7e0a9f6d9ba846d5e5725c38d3b63b0d55eb68e255924dfd0bf07a6a468aa40a07527e649e2cad5d4ac SHA512 e6572ab64d8f41d887e296328c7e70a8b0bd2b746bf0c43a15ecacdc2247725a4229b6f8a53577d90836847c962afb16f85c60b0f22d0927bfe956fcf8dab123
-EBUILD weston-13.0.3-r1.ebuild 3947 BLAKE2B 2a1efcafebf97a94491bd73cce0438215ee710a64d461e2a54885b5c114e0840d14d7fabf77983e3b3ae2cf4e5f9acc3194f85decf88b845e108c65128e29376 SHA512 00c2480f470d946fb785dc77bb5e2c5e09c37db6336cf6db54f293c63397d8e8cf08ec9e9658aa640d00f03335604e159ff8998bc1579e8d518ab52da535d2a3
-EBUILD weston-13.0.3.ebuild 3917 BLAKE2B 9703f094c1838d4f75df50e1a1af16e7349792a4ac8afe656e0015eac07db2e69b6a10342dc1ec98d5fa7a84da7a04381f37904ef41a5a95ada96620af2094a8 SHA512 0e6c46b791eb461192b9de7890d8596e1998203b6be51f01d2961f9d4e358df0ba6018971dbb5b460ff08647107aaf1ec9e505683272c6c3ba7b7d3d3aaeec4b
-EBUILD weston-9999.ebuild 3853 BLAKE2B 8701609a596456457e638446794bf19ca4f255acb426c7175e883b2c65af392edfc666fe0e001f9186d21252f506883d46af92a1462d1cacc1b7c34bf0dbe2a2 SHA512 9b84ac9b14c3d5d2c9c88503d8a75bd90079cf88a079f1cb4861774c49be91f252aa4a831fef453332c78ee8996d7e4d6356dac9ac1873a7694b93405595dfea
+EBUILD weston-13.0.0-r4.ebuild 3900 BLAKE2B e25a59fc19fc49062d60d3019e177a013b8ae6904217fc22d8d6ddc0d5ced4f3f275529400914478b0963ca5bf88398a3ae56cd1a4e23d3620a77e75f4c7b491 SHA512 10c7c387c7cfcb348d076bf60714b0c6d503a93526c7238c28a113dc92bd85bf53105718cf57c6430d5074ece581a66399db6841465a2e012c2b4fcb4de52ef5
+EBUILD weston-13.0.3-r2.ebuild 3952 BLAKE2B 6488d110b01e811375261ac2987bb0371f07e5da0839a876b089e1590b7603fa0e7c5b4cb1e25ed0aff59e0afa1c4b9693a9e1c6d28a43033a96190588fb7bb8 SHA512 e72266d2ea2d9eb49e46cbcbe90e9b5b4fb68bc493f10c8834b3ffdbee25afc22c798d8be77b662ec8575ffc1ed2634ae1e8fb493a08b7ff58a79aae1b716bc0
+EBUILD weston-9999.ebuild 3852 BLAKE2B bbacd0bdc0a407968b27377dcc7613e3ab498aabaaeca77e93fc89c11c3fe7758d05386072d56a3f372f2ff69535dc4519773464a5febcf8f56627bcc2bfd780 SHA512 c8721ee7a517842ca3c254e4287663fbe560d70ed834872650bfa2b1394219b2e9d079697eca5e992e9165f51adc70b251604527bb49a9f82f4bdfe1d052c5aa
 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57
diff --git a/dev-libs/weston/weston-13.0.0-r3.ebuild b/dev-libs/weston/weston-13.0.0-r3.ebuild
deleted file mode 100644
index 2ab5833684f4..000000000000
--- a/dev-libs/weston/weston-13.0.0-r3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-13.0.0-r4.ebuild b/dev-libs/weston/weston-13.0.0-r4.ebuild
new file mode 100644
index 000000000000..a3c477a7802b
--- /dev/null
+++ b/dev-libs/weston/weston-13.0.0-r4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		=media-libs/libdisplay-info-0.1*
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-13.0.3-r1.ebuild b/dev-libs/weston/weston-13.0.3-r1.ebuild
deleted file mode 100644
index b03a284e1eac..000000000000
--- a/dev-libs/weston/weston-13.0.3-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-	"${FILESDIR}"/${PN}-musl-basename.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-13.0.3-r2.ebuild b/dev-libs/weston/weston-13.0.3-r2.ebuild
new file mode 100644
index 000000000000..abe7074e3de7
--- /dev/null
+++ b/dev-libs/weston/weston-13.0.3-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		=media-libs/libdisplay-info-0.1*
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+	"${FILESDIR}"/${PN}-musl-basename.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-13.0.3.ebuild b/dev-libs/weston/weston-13.0.3.ebuild
deleted file mode 100644
index cbc58686914c..000000000000
--- a/dev-libs/weston/weston-13.0.3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-	"${FILESDIR}"/${PN}-musl-basename.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 84ea1f937e3b..3df7fd4b2e1c 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -41,7 +41,6 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-1.2.0
 	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
 	media-libs/libpng:0=
 	sys-auth/seatd:=
 	>=x11-libs/cairo-1.11.3
@@ -50,6 +49,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
 	drm? (
+		=media-libs/libdisplay-info-0.1*
 		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
-- 
cgit v1.2.3