gentoo resync : 25.08.2020

10 files changed, 45 insertions, 289 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index dfebf7a8ad6c..95b46799c7bb 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,19 +1,12 @@
-AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
-AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311
-AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a
 AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
-DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
-DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
-DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
 DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
 DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
-EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 5e6eaaf5c081f0749530b4a69971993e7f926ab69e8fc9f239fddb01c12f42fdc5c788736a3707746b286fdedfcd9dd3b59617bc0a794718c16f6cfbe7fc5ce3 SHA512 88a1a8256211fac613752fdfe62fc9d8f666ef7f7dac7a536ac2312357c7bea6a55316dd7e9f81e810c5d10654afc61a3b62ecd59eeeb01a786b335d1b92fc57
-EBUILD meson-0.53.1.ebuild 1981 BLAKE2B ae5dbc32f30a50456ad7bb5780b248e494c22838ba34846141551e206b20ceffcfb3c40908dd17814cdeacac2713b1f4dce69392257b9c12dd3bcc8eab18d697 SHA512 dab0953fc1fd408130d00b2c36fad8a292c0c3e8a1e3b3b97aa675522fd6aa56e9f884f39165ebcc8547d30253250a9e63a7cf922653c1bef569717d51f3f0e2
-EBUILD meson-0.54.0.ebuild 1544 BLAKE2B b326f8d159b8e75dd38300046fb7ce718335dc1717735ea0a41754f5331a0d9613260b736603f8d0194e88878cf3c34dfa18f076ed031c5f51bbbc9897465c63 SHA512 8fd2b4c23c6ace8021c0c267472b5bafc4a64092ea5fab222f1d637927769626e3d5f72f40446dba8603abda0e49a5ae88aac912df49a0d70cc8e5fae097f025
-EBUILD meson-0.54.1.ebuild 2036 BLAKE2B 23f30ffed174af8155f3a1e6cb761d085f1a8688df6137368752bac79fc57fbb6475310d6f2893beefe3754849bd579bdf50d17e4c2052ff3c9c7507f85f0cc8 SHA512 80949c24c9395631fb8c6b60a75df0360707deb3a2052449f47f9908f793b22d632b6881349278f72f9d820c52985f569719d2bbcfdf135d0ec0fbaaef65bba0
+DIST meson-0.55.0.tar.gz 1742882 BLAKE2B 5ca2c6a881a9db72532849e66a52315273033188531a446ae3571faa37d6f698562e1dbd91770156c0c959e06cc7ba62a9ff274cf0d1745e3849435418755723 SHA512 bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
+DIST meson-0.55.1.tar.gz 1740517 BLAKE2B faec7973d00e13d82268f04b4dd28888d5196df72db1a63c388d23e03195fe18f54207a7f62dd920f53b6001e08e036950db391656d7074ef90df76b93bcfee3 SHA512 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
 EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
-EBUILD meson-0.54.3.ebuild 2347 BLAKE2B 8e12969d4c7aed7050ea6cb1016cded8c7fcd42bc3b84a5f197006f71f21db310ef34fc62a9ae88a8ba861a828cda73e18d143d4e73bdc9453a76344191543a0 SHA512 ba232f75d4409a55aca941093a96bc36e7ca9794a3761d8084c1728a6f07602a5f934ed7cfdafbddd80e36f00af009fef87e015eb74ce1833168a8a26e08ecaf
-EBUILD meson-9999.ebuild 2291 BLAKE2B dd136009f68b5aab380a5edcfb23b2950262bf4fe31cad2f6a64c699da387b67b3eb7fe1bf81a8fe54cfdda5dc48516f30ec137bdce5b88cd5e58b0884de0964 SHA512 3ddb12fa7defc9faa69136bc95f2f9526e79e48828072f79879162dff4e29da6184cf5ba7951fb5354b970cef3fcd20a6c67b371a6b3b5f0342e2ae2041e9fe3
+EBUILD meson-0.54.3.ebuild 2410 BLAKE2B f7110eaa51d30fd218f599fd06001c29c9783ac9d041f545b1b3d90bd3f226978bf4a5ea55bd0916032f60e88270266968634edaffd833cd46a2e6f71af67e63 SHA512 f9a06b026528c843b0b96f99c9a0576d2d79f321564663f8a6ad8364c41c89f1fe2402b5420296906a11f9520b870a3bae61dc7e83cc1e8e3c029242dcb269b5
+EBUILD meson-0.55.0.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
deleted file mode 100644
index ec753e00230a..000000000000
--- a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 13 Jan 2020 23:46:09 -0500
-Subject: [PATCH] test_pkgconfig_gen_deps: set
- PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib
-
-pkgconf automatically prunes "system library paths" from its output. The
-system library paths depend on the system toolchain. A common value on a
-64-bit system is as follows:
-
-/lib64:/usr/lib64:/usr/local/lib64
-
-So, if -L/usr/lib64 appears in the Libs section, it will be pruned from
-the output of pkg-config --libs.
-
-The pc files generated for this test contain something like this:
-
-libdir=/usr/lib
-Libs: -L${libdir} ...
-
-pkgconf may not consider /usr/lib to be a system library path, so it is
-not pruned as the test expects. To work around this, override the
-compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH
-environment variable.
-
-Fixes: https://github.com/mesonbuild/meson/issues/6004
----
- run_unittests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 898f05e54d..5a60b9b6a4 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self):
-         privatedir2 = self.privatedir
- 
-         os.environ
--        env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])}
-+        env = {
-+            'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]),
-+            'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib',
-+        }
-         self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env)
- 
-         # pkg-config strips some duplicated flags so we have to parse the
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
deleted file mode 100644
index 4ee11829904d..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:24:42 -0600
-Subject: [PATCH 1/2] remove asan ld_preload
-
-ASAN and sandbox both want control over LD_PRELOAD
-https://bugs.gentoo.org/673016
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 676604f4..1c9aaf0c 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
-                              r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
- 
-     @skip_if_not_base_option('b_sanitize')
--    def test_generate_gir_with_address_sanitizer(self):
-+    def _test_generate_gir_with_address_sanitizer(self):
-         if is_cygwin():
-             raise unittest.SkipTest('asan not available on Cygwin')
-         if is_openbsd():
--- 
-2.24.1
-
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
deleted file mode 100644
index 4cc2aead0ba6..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:28:35 -0600
-Subject: [PATCH 2/2] remove asan
-
-ASAN is unsupported on some targets
-https://bugs.gentoo.org/692822
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 1c9aaf0c..171ee0f0 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
-         self.assertEqual(install_rpath, 'baz')
- 
-     @skip_if_not_base_option('b_sanitize')
--    def test_pch_with_address_sanitizer(self):
-+    def _test_pch_with_address_sanitizer(self):
-         if is_cygwin():
-             raise unittest.SkipTest('asan not available on Cygwin')
-         if is_openbsd():
--- 
-2.24.1
-
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
deleted file mode 100644
index 077d7508af29..000000000000
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
-	)
-
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
deleted file mode 100644
index 77f6244e6e29..000000000000
--- a/dev-util/meson/meson-0.54.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index f29fb08b500f..cb38de99a7a9 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.55.0.ebuild
index a0802ef4fcb5..38ccf9179e21 100644
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ b/dev-util/meson/meson-0.55.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -34,16 +34,24 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	"${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	"${FILESDIR}"/0.53.1-remove-asan.patch
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
 	)
 
-python_prepare_all() {
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
diff --git a/dev-util/meson/meson-0.54.1.ebuild b/dev-util/meson/meson-0.55.1.ebuild
index 053a12bbeb2f..38ccf9179e21 100644
--- a/dev-util/meson/meson-0.54.1.ebuild
+++ b/dev-util/meson/meson-0.55.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -35,13 +35,23 @@ DEPEND="
 "
 
 python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
 
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index edbd30f51167..38ccf9179e21 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -56,8 +56,6 @@ python_prepare_all() {
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
-	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
-
 	distutils-r1_python_prepare_all
 }