gentoo resync : 04.01.2022

4 files changed, 8 insertions, 36 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 410baed61b8b..da2c8f74f998 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,10 @@
 AUX meson-0.60.2-check-module-linking.patch 1015 BLAKE2B 63fdee7a00743c9b28a88283f9b626c7705099c5a90b3f573bee3cc2125449a537e4d6ecac9c57160fb05753f94fef5fe134dcbdc0e9de4f1dfeaa65173031fd SHA512 08c472b1a182f380e4bf13e69bb45a287f3df0d92993bc841a1d90a74f479e033a95d9c06cf441ce33651b5e3ba32f8a8a86b2cb94238a6f9cb5936345056522
 AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff53b8b3bba66f1098fcf06e4d2f387c83f007d4d92e4b1a7f46b9eeea3d4f2273ddd402e7131b84885f81be8f815be59d8e34539bb13f7ef87f8e SHA512 7d455b1a8d21730bfbeedb5be5ca70978a3ed2af3e7d55a7f0cbf5405b6f7935c7c1f3961dbc09e7e42b3bfc7f2752316458e8627d7846b230638d5b2d6450e7
-AUX meson-tests-rust-add-libm.patch 828 BLAKE2B 1d1165703aa3c82295a25860d85c6f3e468f21a11a90c6b8e92f4ddd6f91a5769bcf4f409bbe788da1a5bdf6daa4f02d7e30cb3322b08ae65be324c0c3bf34e6 SHA512 51d67c2c2d45ac1e1eb2b7b82f4a6283361afd7507ab722a22d6e45c2b9c2094bfcd97e5e67f3215da6239a1cfee68bd37441b7657b5618eabc758fffe5ea633
-DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
 DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
-EBUILD meson-0.59.1-r1.ebuild 2804 BLAKE2B 8ea60235201c73c667985ea4cb48d45ced5453e2da646352cb52368a6b28a4fba4d664c1405254205a1697dcf4e94885a1028c28faefa35f93ecb715197a3b32 SHA512 bdebf4f3646e6d32318647d9edf5a1845edcc0e23ce36fb2d498c3d53260d68a7b89050d8371153c8394da7d89ec5aec5d9aff8df878ce03311979f086b9d61d
+DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
 EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
 EBUILD meson-0.60.2-r1.ebuild 2756 BLAKE2B e3c00db9be838a448e1b63ab7987db64590375fd3ff6c714ffc883af5982a8ca109d56a3f5539808e90022091e83735baf804f0b75f9929b5b323080abad69ed SHA512 ab5ced255a8ab04475ee1f68c4b3b10769d17332c5f8cf3a9b4ba42d4ac5d2ea9664ba99e9638bc05fcb9f4d8201ca91a5032a1567e630347bf15d2ecd63d77a
-EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
+EBUILD meson-0.60.3.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131
+EBUILD meson-9999.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch
deleted file mode 100644
index 45803976bb9b..000000000000
--- a/dev-util/meson/files/meson-tests-rust-add-libm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Wed, 29 Sep 2021 14:20:53 +0200
-Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55
-
-Fixes #9309
----
- test cases/rust/5 polyglot static/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build
-index de2e61bcbc3..a6e9550b6e2 100644
---- a/test cases/rust/5 polyglot static/meson.build	
-+++ b/test cases/rust/5 polyglot static/meson.build	
-@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust')
- 
- deps = [
-   meson.get_compiler('c').find_library('dl', required: false),
-+  meson.get_compiler('c').find_library('m', required: false),
-   dependency('threads'),
- ]
- 
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.60.3.ebuild
index f5024d59f182..b1532c0364e4 100644
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ b/dev-util/meson/meson-0.60.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
@@ -9,7 +9,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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -33,11 +33,6 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
-	"${FILESDIR}/meson-tests-rust-add-libm.patch"
-)
-
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
@@ -88,7 +83,7 @@ python_test() {
 		# If JAVA_HOME is not set, meson looks for javac in PATH.
 		# If javac is in /usr/bin, meson assumes /usr/include is a valid
 		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodection. If no JDK is installed, we should end up with an empty
+		# autodetection. If no JDK is installed, we should end up with an empty
 		# value in JAVA_HOME, and the tests should get skipped.
 		export JAVA_HOME=$(java-config -O 2>/dev/null)
 
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index e2a175666ca3..b1532c0364e4 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
@@ -83,7 +83,7 @@ python_test() {
 		# If JAVA_HOME is not set, meson looks for javac in PATH.
 		# If javac is in /usr/bin, meson assumes /usr/include is a valid
 		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodection. If no JDK is installed, we should end up with an empty
+		# autodetection. If no JDK is installed, we should end up with an empty
 		# value in JAVA_HOME, and the tests should get skipped.
 		export JAVA_HOME=$(java-config -O 2>/dev/null)